diff options
281 files changed, 16961 insertions, 14572 deletions
diff --git a/.gitignore b/.gitignore index ef404048c0..6294cb451d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ lib*.a /.project /.cproject /.settings +/.autotools /Icon.* /build diff --git a/audio/decoders/aac.h b/audio/decoders/aac.h index f14fa9488b..efcbcc6f42 100644 --- a/audio/decoders/aac.h +++ b/audio/decoders/aac.h @@ -46,13 +46,16 @@ namespace Audio { class AudioStream; /** - * Create a new AudioStream from the AAC data in the given stream. + * Create a new AudioStream from the AAC data of an MPEG-4 file in the given stream. * - * @param stream the SeekableReadStream from which to read the AAC data + * @note This should *only* be called by our QuickTime/MPEG-4 decoder since it relies + * on the MPEG-4 extra data. If you want to decode a file using AAC, go use + * makeQuickTimeStream() instead! + * @param stream the SeekableReadStream from which to read the AAC data * @param disposeStream whether to delete the stream after use * @param extraData the SeekableReadStream from which to read the AAC extra data * @param disposeExtraData whether to delete the extra data stream after use - * @return a new AudioStream, or NULL, if an error occurred + * @return a new AudioStream, or NULL, if an error occurred */ AudioStream *makeAACStream( Common::SeekableReadStream *stream, diff --git a/audio/decoders/quicktime.h b/audio/decoders/quicktime.h index ff81ec9390..413f527221 100644 --- a/audio/decoders/quicktime.h +++ b/audio/decoders/quicktime.h @@ -50,8 +50,8 @@ class SeekableAudioStream; * Try to load a QuickTime sound file from the given file name and create a SeekableAudioStream * from that data. * - * @param filename the filename of the file from which to read the data - * @return a new SeekableAudioStream, or NULL, if an error occurred + * @param filename the filename of the file from which to read the data + * @return a new SeekableAudioStream, or NULL, if an error occurred */ SeekableAudioStream *makeQuickTimeStream(const Common::String &filename); @@ -59,9 +59,9 @@ SeekableAudioStream *makeQuickTimeStream(const Common::String &filename); * Try to load a QuickTime sound file from the given seekable stream and create a SeekableAudioStream * from that data. * - * @param stream the SeekableReadStream from which to read the data - * @param disposeAfterUse whether to delete the stream after use - * @return a new SeekableAudioStream, or NULL, if an error occurred + * @param stream the SeekableReadStream from which to read the data + * @param disposeAfterUse whether to delete the stream after use + * @return a new SeekableAudioStream, or NULL, if an error occurred */ SeekableAudioStream *makeQuickTimeStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES); diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp index 5839f5b9d7..0ca70b24f8 100644 --- a/audio/mididrv.cpp +++ b/audio/mididrv.cpp @@ -25,7 +25,9 @@ #include "common/str.h" #include "common/system.h" #include "common/textconsole.h" +#include "common/translation.h" #include "common/util.h" +#include "gui/message.h" #include "audio/mididrv.h" #include "audio/musicplugin.h" @@ -110,6 +112,8 @@ Common::String MidiDriver::getDeviceString(DeviceHandle handle, DeviceStringType return d->getMusicDriverName(); else if (type == kDriverId) return d->getMusicDriverId(); + else if (type == kDeviceName) + return d->getCompleteName(); else if (type == kDeviceId) return d->getCompleteId(); else @@ -125,6 +129,7 @@ Common::String MidiDriver::getDeviceString(DeviceHandle handle, DeviceStringType MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { // Query the selected music device (defaults to MT_AUTO device). DeviceHandle hdl = getDeviceHandle(ConfMan.get("music_driver")); + DeviceHandle reslt = 0; _forceTypeMT32 = false; @@ -133,143 +138,217 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { switch (getMusicType(hdl)) { case MT_PCSPK: if (flags & MDT_PCSPK) - return hdl; + reslt = hdl; break; case MT_PCJR: if (flags & MDT_PCJR) - return hdl; + reslt = hdl; break; case MT_CMS: if (flags & MDT_CMS) - return hdl; + reslt = hdl; break; case MT_ADLIB: if (flags & MDT_ADLIB) - return hdl; + reslt = hdl; break; case MT_C64: if (flags & MDT_C64) - return hdl; + reslt = hdl; break; case MT_AMIGA: if (flags & MDT_AMIGA) - return hdl; + reslt = hdl; break; case MT_APPLEIIGS: if (flags & MDT_APPLEIIGS) - return hdl; + reslt = hdl; break; case MT_TOWNS: if (flags & MDT_TOWNS) - return hdl; + reslt = hdl; break; case MT_PC98: if (flags & MDT_PC98) - return hdl; + reslt = hdl; break; case MT_GM: case MT_GS: case MT_MT32: if (flags & MDT_MIDI) - return hdl; + reslt = hdl; break; case MT_NULL: - return hdl; + reslt = hdl; + break; default: break; } + Common::String failedDevStr; + if (getMusicType(hdl) == MT_INVALID) { + // If the expressly selected driver or device cannot be found (no longer compiled in, turned off, etc.) + // we display a warning and continue. + failedDevStr = ConfMan.get("music_driver"); + Common::String warningMsg = Common::String::format(_("The selected audio device '%s' was not found (e.g. might be turned off or disconnected). Attempting to fall back to the next available device..."), failedDevStr.c_str()); + GUI::MessageDialog dialog(warningMsg); + dialog.runModal(); + } + + MusicType tp = getMusicType(reslt); + if (tp != MT_INVALID && tp != MT_AUTO) { + if (checkDevice(reslt)) { + return reslt; + } else { + // If the expressly selected device cannot be used we display a warning and continue. + failedDevStr = getDeviceString(hdl, MidiDriver::kDeviceName); + Common::String warningMsg = Common::String::format(_("The selected audio device '%s' cannot be used. See log file for more information. Attempting to fall back to the next available device..."), failedDevStr.c_str()); + GUI::MessageDialog dialog(warningMsg); + dialog.runModal(); + } + } + // If the selected driver did not match the flags setting, // we try to determine a suitable and "optimal" music driver. const MusicPlugin::List p = MusicMan.getPlugins(); // If only MDT_MIDI but not MDT_PREFER_MT32 or MDT_PREFER_GM is set we prefer the other devices (which will always be - // detected since they are hard coded and cannot be disabled. - for (int l = (flags & (MDT_PREFER_GM | MDT_PREFER_MT32)) ? 1 : 0; l < 2; ++l) { - if ((flags & MDT_MIDI) && (l == 1)) { - // If a preferred MT32 or GM device has been selected that device gets returned. - if (flags & MDT_PREFER_MT32) - hdl = getDeviceHandle(ConfMan.get("mt32_device")); + // detected since they are hard coded and cannot be disabled). + bool skipMidi = !(flags & (MDT_PREFER_GM | MDT_PREFER_MT32)); + while (flags != MDT_NONE) { + if ((flags & MDT_MIDI) && !skipMidi) { + // If a preferred MT32 or GM device has been selected that device gets returned if available. + Common::String devStr; + if (flags & MDT_PREFER_MT32) + devStr = ConfMan.get("mt32_device"); else if (flags & MDT_PREFER_GM) - hdl = getDeviceHandle(ConfMan.get("gm_device")); + devStr = ConfMan.get("gm_device"); else - hdl = getDeviceHandle("auto"); + devStr = "auto"; + hdl = getDeviceHandle(devStr); const MusicType type = getMusicType(hdl); // If we have a "Don't use GM/MT-32" setting we skip this part and jump // to AdLib, PC Speaker etc. detection right away. if (type != MT_NULL) { - if (type != MT_AUTO && type != MT_INVALID) { - if (flags & MDT_PREFER_MT32) - // If we have a preferred MT32 device we disable the gm/mt32 mapping (more about this in mididrv.h). - _forceTypeMT32 = true; - - return hdl; + if (type == MT_INVALID) { + // If the preferred (expressly requested) selected driver or device cannot be found (no longer compiled in, turned off, etc.) + // we display a warning and continue. Don't warn about the missing device if we did already (this becomes relevant if the + // missing device is selected as preferred device and also as GM or MT-32 device). + if (failedDevStr != devStr) { + Common::String warningMsg = Common::String::format(_("The preferred audio device '%s' was not found (e.g. might be turned off or disconnected). Attempting to fall back to the next available device..."), devStr.c_str()); + GUI::MessageDialog dialog(warningMsg); + dialog.runModal(); + } + } else if (type != MT_AUTO) { + if (checkDevice(hdl)) { + if (flags & MDT_PREFER_MT32) + // If we have a preferred MT32 device we disable the gm/mt32 mapping (more about this in mididrv.h). + _forceTypeMT32 = true; + return hdl; + } else { + // If the preferred (expressly requested) device cannot be used we display a warning and continue. + // Don't warn about the failing device if we did already (this becomes relevant if the failing + // device is selected as preferred device and also as GM or MT-32 device). + if (failedDevStr != getDeviceString(hdl, MidiDriver::kDeviceName)) { + Common::String warningMsg = Common::String::format(_("The preferred audio device '%s' cannot be used. See log file for more information. Attempting to fall back to the next available device..."), getDeviceString(hdl, MidiDriver::kDeviceName).c_str()); + GUI::MessageDialog dialog(warningMsg); + dialog.runModal(); + } + } } // If no specific device is selected (neither in the scummvm nor in the game domain) - // and there is no preferred MT32 or GM device selected either we arrive here. + // and there is no preferred MT32 or GM device selected either or if the detected device is unavailable we arrive here. // If MT32 is preferred we try for the first available device with music type 'MT_MT32' (usually the mt32 emulator). if (flags & MDT_PREFER_MT32) { for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) { MusicDevices i = (**m)->getDevices(); for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { - if (d->getMusicType() == MT_MT32) - return d->getHandle(); + if (d->getMusicType() == MT_MT32) { + hdl = d->getHandle(); + if (checkDevice(hdl)) + return hdl; + } } } } - // Now we default to the first available device with music type 'MT_GM' - for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) { - MusicDevices i = (**m)->getDevices(); - for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { - if (d->getMusicType() == MT_GM || d->getMusicType() == MT_GS) - return d->getHandle(); + // Now we default to the first available device with music type 'MT_GM' if not + // MT-32 is preferred or if MT-32 is preferred but all other devices have failed. + if (!(flags & MDT_PREFER_MT32) || flags == (MDT_PREFER_MT32 | MDT_MIDI)) { + for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) { + MusicDevices i = (**m)->getDevices(); + for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { + if (d->getMusicType() == MT_GM || d->getMusicType() == MT_GS) { + hdl = d->getHandle(); + if (checkDevice(hdl)) + return hdl; + } + } } + // Detection flags get removed after final detection attempt to avoid further attempts. + flags &= ~(MDT_MIDI | MDT_PREFER_GM | MDT_PREFER_MT32); } } } - MusicType tp = MT_AUTO; - if (flags & MDT_TOWNS) + // The order in this list is important, since this is the order of preference + // (e.g. MT_ADLIB is checked before MT_PCJR and MT_PCSPK for a good reason). + // Detection flags get removed after detection attempt to avoid further attempts. + if (flags & MDT_TOWNS) { tp = MT_TOWNS; - else if (flags & MDT_PC98) + flags &= ~MDT_TOWNS; + } else if (flags & MDT_PC98) { tp = MT_PC98; - else if (flags & MDT_ADLIB) + flags &= ~MDT_PC98; + } else if (flags & MDT_ADLIB) { tp = MT_ADLIB; - else if (flags & MDT_PCJR) + flags &= ~MDT_ADLIB; + } else if (flags & MDT_PCJR) { tp = MT_PCJR; - else if (flags & MDT_PCSPK) + flags &= ~MDT_PCJR; + } else if (flags & MDT_PCSPK) { tp = MT_PCSPK; - else if (flags & MDT_C64) + flags &= ~MDT_PCSPK; + } else if (flags & MDT_C64) { tp = MT_C64; - else if (flags & MDT_AMIGA) + flags &= ~MDT_C64; + } else if (flags & MDT_AMIGA) { tp = MT_AMIGA; - else if (flags & MDT_APPLEIIGS) + flags &= ~MDT_AMIGA; + } else if (flags & MDT_APPLEIIGS) { tp = MT_APPLEIIGS; - else if (l == 0) + flags &= ~MDT_APPLEIIGS; + } else if (flags & MDT_MIDI) { // If we haven't tried to find a MIDI device yet we do this now. + skipMidi = false; continue; - else + } else if (flags) { + // Invalid flags. Set them to MDT_NONE to leave detection loop. + flags = MDT_NONE; tp = MT_AUTO; + } for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) { MusicDevices i = (**m)->getDevices(); for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { - if (d->getMusicType() == tp) - return d->getHandle(); + if (d->getMusicType() == tp) { + hdl = d->getHandle(); + if (checkDevice(hdl)) + return hdl; + } } } } @@ -288,6 +367,16 @@ MidiDriver *MidiDriver::createMidi(MidiDriver::DeviceHandle handle) { return driver; } +bool MidiDriver::checkDevice(MidiDriver::DeviceHandle handle) { + const MusicPlugin::List p = MusicMan.getPlugins(); + for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) { + if (getDeviceString(handle, MidiDriver::kDriverId).equals((**m)->getId())) + return (**m)->checkDevice(handle); + } + + return false; +} + MidiDriver::DeviceHandle MidiDriver::getDeviceHandle(const Common::String &identifier) { const MusicPlugin::List p = MusicMan.getPlugins(); diff --git a/audio/mididrv.h b/audio/mididrv.h index 7369cab26b..e3f6461be9 100644 --- a/audio/mididrv.h +++ b/audio/mididrv.h @@ -142,6 +142,7 @@ public: enum DeviceStringType { kDriverName, kDriverId, + kDeviceName, kDeviceId }; @@ -156,6 +157,9 @@ public: /** Find the music driver matching the given driver name/description. */ static DeviceHandle getDeviceHandle(const Common::String &identifier); + /** Check whether the device with the given handle is available. */ + static bool checkDevice(DeviceHandle handle); + /** Get the music type matching the given device handle, or MT_AUTO if there is no match. */ static MusicType getMusicType(DeviceHandle handle); diff --git a/audio/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp index 7c3cf102d1..85491faaf8 100644 --- a/audio/midiparser_xmidi.cpp +++ b/audio/midiparser_xmidi.cpp @@ -256,26 +256,25 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) { // Add eight bytes i += 8; - if (memcmp(buf, "INFO", 4)) { - // Must align - pos += (chunk_len + 1) & ~1; - i += (chunk_len + 1) & ~1; - continue; - } - - // Must be at least 2 bytes long - if (chunk_len < 2) { - warning("Invalid chunk length %d for 'INFO' block", (int)chunk_len); - return false; - } + if (memcmp(buf, "INFO", 4) == 0) { + // Must be at least 2 bytes long + if (chunk_len < 2) { + warning("Invalid chunk length %d for 'INFO' block", (int)chunk_len); + return false; + } - _num_tracks = (byte)read2low(pos); + _num_tracks = (byte)read2low(pos); - if (chunk_len > 2) { - warning("Chunk length %d is greater than 2", (int)chunk_len); - pos += chunk_len - 2; + if (chunk_len > 2) { + warning("Chunk length %d is greater than 2", (int)chunk_len); + //pos += chunk_len - 2; + } + break; } - break; + + // Must align + pos += (chunk_len + 1) & ~1; + i += (chunk_len + 1) & ~1; } // Didn't get to fill the header diff --git a/audio/mixer.cpp b/audio/mixer.cpp index fb4fffb8d8..128224ae85 100644 --- a/audio/mixer.cpp +++ b/audio/mixer.cpp @@ -94,6 +94,13 @@ public: void setVolume(const byte volume); /** + * Gets the channel's own volume. + * + * @return volume + */ + byte getVolume(); + + /** * Sets the channel's balance setting. * * @param balance new balance @@ -101,6 +108,13 @@ public: void setBalance(const int8 balance); /** + * Gets the channel's balance setting. + * + * @return balance + */ + int8 getBalance(); + + /** * Notifies the channel that the global sound type * volume settings changed. */ @@ -342,6 +356,14 @@ void MixerImpl::setChannelVolume(SoundHandle handle, byte volume) { _channels[index]->setVolume(volume); } +byte MixerImpl::getChannelVolume(SoundHandle handle) { + const int index = handle._val % NUM_CHANNELS; + if (!_channels[index] || _channels[index]->getHandle()._val != handle._val) + return 0; + + return _channels[index]->getVolume(); +} + void MixerImpl::setChannelBalance(SoundHandle handle, int8 balance) { Common::StackLock lock(_mutex); @@ -352,6 +374,14 @@ void MixerImpl::setChannelBalance(SoundHandle handle, int8 balance) { _channels[index]->setBalance(balance); } +int8 MixerImpl::getChannelBalance(SoundHandle handle) { + const int index = handle._val % NUM_CHANNELS; + if (!_channels[index] || _channels[index]->getHandle()._val != handle._val) + return 0; + + return _channels[index]->getBalance(); +} + uint32 MixerImpl::getSoundElapsedTime(SoundHandle handle) { return getElapsedTime(handle).msecs(); } @@ -482,11 +512,19 @@ void Channel::setVolume(const byte volume) { updateChannelVolumes(); } +byte Channel::getVolume() { + return _volume; +} + void Channel::setBalance(const int8 balance) { _balance = balance; updateChannelVolumes(); } +int8 Channel::getBalance() { + return _balance; +} + void Channel::updateChannelVolumes() { // From the channel balance/volume and the global volume, we compute // the effective volume for the left and right channel. Note the diff --git a/audio/mixer.h b/audio/mixer.h index 1fbe265488..de709e13fe 100644 --- a/audio/mixer.h +++ b/audio/mixer.h @@ -211,6 +211,14 @@ public: virtual void setChannelVolume(SoundHandle handle, byte volume) = 0; /** + * Get the channel volume for the given handle. + * + * @param handle the sound to affect + * @return channel volume + */ + virtual byte getChannelVolume(SoundHandle handle) = 0; + + /** * Set the channel balance for the given handle. * * @param handle the sound to affect @@ -220,6 +228,14 @@ public: virtual void setChannelBalance(SoundHandle handle, int8 balance) = 0; /** + * Get the channel balance for the given handle. + * + * @param handle the sound to affect + * @return channel balance + */ + virtual int8 getChannelBalance(SoundHandle handle) = 0; + + /** * Get approximation of for how long the channel has been playing. */ virtual uint32 getSoundElapsedTime(SoundHandle handle) = 0; diff --git a/audio/mixer_intern.h b/audio/mixer_intern.h index a04eb55c5b..dc361ce560 100644 --- a/audio/mixer_intern.h +++ b/audio/mixer_intern.h @@ -105,7 +105,9 @@ public: virtual bool isSoundTypeMuted(SoundType type) const; virtual void setChannelVolume(SoundHandle handle, byte volume); + virtual byte getChannelVolume(SoundHandle handle); virtual void setChannelBalance(SoundHandle handle, int8 balance); + virtual int8 getChannelBalance(SoundHandle handle); virtual uint32 getSoundElapsedTime(SoundHandle handle); virtual Timestamp getElapsedTime(SoundHandle handle); diff --git a/audio/musicplugin.h b/audio/musicplugin.h index 2a25962b87..307293a7c9 100644 --- a/audio/musicplugin.h +++ b/audio/musicplugin.h @@ -90,6 +90,13 @@ public: virtual MusicDevices getDevices() const = 0; /** + * Checks whether a device can actually be used. Currently this is only + * implemented for the MT-32 emulator to check whether the required rom + * files are present. + */ + virtual bool checkDevice(MidiDriver::DeviceHandle) const { return true; } + + /** * Tries to instantiate a MIDI Driver instance based on the device * previously detected via MidiDriver::detectDevice() * diff --git a/audio/softsynth/fmtowns_pc98/towns_midi.cpp b/audio/softsynth/fmtowns_pc98/towns_midi.cpp index 4617b0555c..071a697615 100644 --- a/audio/softsynth/fmtowns_pc98/towns_midi.cpp +++ b/audio/softsynth/fmtowns_pc98/towns_midi.cpp @@ -833,9 +833,8 @@ const uint8 TownsMidiInputChannel::_programAdjustLevel[] = { }; MidiDriver_TOWNS::MidiDriver_TOWNS(Audio::Mixer *mixer) : _timerProc(0), _timerProcPara(0), _channels(0), _out(0), - _chanState(0), _operatorLevelTable(0), _tickCounter1(0), _tickCounter2(0), _rand(1), _allocCurPos(0), _isOpen(false) { - // We set exteral mutex handling to true, since this driver is only suitable for use with the SCUMM engine - // which has its own mutex. This causes lockups which cannot always be avoided. + _baseTempo(10080), _chanState(0), _operatorLevelTable(0), _tickCounter(0), _rand(1), _allocCurPos(0), _isOpen(false) { + // We set exteral mutex handling to true to avoid lockups in SCUMM which has its own mutex. _intf = new TownsAudioInterface(mixer, this, true); _channels = new TownsMidiInputChannel*[32]; @@ -958,7 +957,7 @@ void MidiDriver_TOWNS::setTimerCallback(void *timer_param, Common::TimerManager: } uint32 MidiDriver_TOWNS::getBaseTempo() { - return 10080; + return _baseTempo; } MidiChannel *MidiDriver_TOWNS::allocateChannel() { @@ -986,12 +985,6 @@ void MidiDriver_TOWNS::timerCallback(int timerId) { case 1: updateParser(); updateOutputChannels(); - - /*_tickCounter1 += 10000; - while (_tickCounter1 >= 4167) { - _tickCounter1 -= 4167; - unkUpdate(); - }*/ break; default: break; @@ -1004,9 +997,9 @@ void MidiDriver_TOWNS::updateParser() { } void MidiDriver_TOWNS::updateOutputChannels() { - _tickCounter2 += 10000; - while (_tickCounter2 >= 16667) { - _tickCounter2 -= 16667; + _tickCounter += _baseTempo; + while (_tickCounter >= 16667) { + _tickCounter -= 16667; for (int i = 0; i < 6; i++) { if (_out[i]->update()) return; diff --git a/audio/softsynth/fmtowns_pc98/towns_midi.h b/audio/softsynth/fmtowns_pc98/towns_midi.h index a98bb1b59c..9aa7c93b35 100644 --- a/audio/softsynth/fmtowns_pc98/towns_midi.h +++ b/audio/softsynth/fmtowns_pc98/towns_midi.h @@ -69,14 +69,15 @@ private: TownsAudioInterface *_intf; - uint32 _tickCounter1; - uint32 _tickCounter2; + uint32 _tickCounter; uint8 _allocCurPos; uint8 _rand; bool _isOpen; uint8 *_operatorLevelTable; + + const uint16 _baseTempo; }; #endif diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp index 27a5a629c4..6d13ec33b4 100644 --- a/audio/softsynth/mt32.cpp +++ b/audio/softsynth/mt32.cpp @@ -20,6 +20,7 @@ */ #include "common/scummsys.h" +#include "common/system.h" #ifdef USE_MT32EMU @@ -134,7 +135,7 @@ static int eatSystemEvents() { } static void drawProgress(float progress) { - const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont)); + const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kGUIFont)); Graphics::Surface *screen = g_system->lockScreen(); assert(screen); @@ -173,7 +174,7 @@ static void drawProgress(float progress) { } static void drawMessage(int offset, const Common::String &text) { - const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont)); + const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kGUIFont)); Graphics::Surface *screen = g_system->lockScreen(); assert(screen); @@ -547,6 +548,7 @@ public: } MusicDevices getDevices() const; + bool checkDevice(MidiDriver::DeviceHandle) const; Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const; }; @@ -556,6 +558,16 @@ MusicDevices MT32EmuMusicPlugin::getDevices() const { return devices; } +bool MT32EmuMusicPlugin::checkDevice(MidiDriver::DeviceHandle) const { + if (!((Common::File::exists("MT32_CONTROL.ROM") && Common::File::exists("MT32_PCM.ROM")) || + (Common::File::exists("CM32L_CONTROL.ROM") && Common::File::exists("CM32L_PCM.ROM")))) { + warning("The MT-32 emulator requires one of the two following file sets (not bundled with ScummVM):\n Either 'MT32_CONTROL.ROM' and 'MT32_PCM.ROM' or 'CM32L_CONTROL.ROM' and 'CM32L_PCM.ROM'"); + return false; + } + + return true; +} + Common::Error MT32EmuMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const { if (ConfMan.hasKey("extrapath")) SearchMan.addDirectory("extrapath", ConfMan.get("extrapath")); diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp index 40e702495a..8d22ab732d 100644 --- a/backends/base-backend.cpp +++ b/backends/base-backend.cpp @@ -24,8 +24,16 @@ */ #include "backends/base-backend.h" + +#ifndef DISABLE_DEFAULT_EVENT_MANAGER #include "backends/events/default/default-events.h" +#endif + +#ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER #include "backends/audiocd/default/default-audiocd.h" +#endif + + #include "gui/message.h" void BaseBackend::displayMessageOnOSD(const char *msg) { @@ -34,16 +42,20 @@ void BaseBackend::displayMessageOnOSD(const char *msg) { dialog.runModal(); } +void BaseBackend::initBackend() { + // Init Event manager +#ifndef DISABLE_DEFAULT_EVENT_MANAGER + if (!_eventManager) + _eventManager = new DefaultEventManager(getDefaultEventSource()); +#endif -static Common::EventManager *s_eventManager = 0; + // Init audio CD manager +#ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER + if (!_audiocdManager) + _audiocdManager = new DefaultAudioCDManager(); +#endif -Common::EventManager *BaseBackend::getEventManager() { - // FIXME/TODO: Eventually this method should be turned into an abstract one, - // to force backends to implement this conciously (even if they - // end up returning the default event manager anyway). - if (!s_eventManager) - s_eventManager = new DefaultEventManager(this); - return s_eventManager; + OSystem::initBackend(); } void BaseBackend::fillScreen(uint32 col) { @@ -52,49 +64,3 @@ void BaseBackend::fillScreen(uint32 col) { memset(screen->pixels, col, screen->h * screen->pitch); unlockScreen(); } - - -/* - FIXME: Maybe we should push the default config file loading/saving code below - out to all the backends? -*/ - - -#if defined(POSIX) -#define DEFAULT_CONFIG_FILE ".scummvmrc" -#endif - -#if !defined(POSIX) -#define DEFAULT_CONFIG_FILE "scummvm.ini" -#endif - -BaseBackend::BaseBackend() { - _audiocdManager = 0; -} - -BaseBackend::~BaseBackend() { - delete _audiocdManager; -} - -Common::SeekableReadStream *BaseBackend::createConfigReadStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); - return file.createReadStream(); -} - -Common::WriteStream *BaseBackend::createConfigWriteStream() { -#ifdef __DC__ - return 0; -#else - Common::FSNode file(DEFAULT_CONFIG_FILE); - return file.createWriteStream(); -#endif -} - -AudioCDManager *BaseBackend::getAudioCDManager() { - if (!_audiocdManager) - _audiocdManager = new DefaultAudioCDManager(); - return _audiocdManager; -} - -void BaseBackend::resetGraphicsScale() { -} diff --git a/backends/base-backend.h b/backends/base-backend.h index 864c11544a..c797e831a8 100644 --- a/backends/base-backend.h +++ b/backends/base-backend.h @@ -24,26 +24,22 @@ #define BACKENDS_BASE_BACKEND_H #include "common/system.h" -#include "backends/events/default/default-events.h" +#include "common/events.h" -class BaseBackend : public OSystem, Common::EventSource { +class BaseBackend : public OSystem { +protected: + virtual Common::EventSource *getDefaultEventSource() = 0; public: - BaseBackend(); - ~BaseBackend(); + virtual void initBackend(); - virtual Common::EventManager *getEventManager(); virtual void displayMessageOnOSD(const char *msg); virtual void fillScreen(uint32 col); +}; - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); - - virtual AudioCDManager *getAudioCDManager(); - - virtual void resetGraphicsScale(); - +class EventsBaseBackend : public BaseBackend, Common::EventSource { protected: - AudioCDManager *_audiocdManager; + virtual Common::EventSource *getDefaultEventSource() { return this; } +public: }; diff --git a/backends/events/gp2xsdl/gp2xsdl-events.cpp b/backends/events/gp2xsdl/gp2xsdl-events.cpp deleted file mode 100644 index 86d4de384f..0000000000 --- a/backends/events/gp2xsdl/gp2xsdl-events.cpp +++ /dev/null @@ -1,463 +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 "common/scummsys.h" - -#if defined(GP2X_OLD) - -#include "backends/events/gp2xsdl/gp2xsdl-events.h" -#include "backends/platform/gp2x/gp2x-hw.h" -#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h" - -#include "backends/platform/sdl/sdl.h" - -// FIXME move joystick defines out and replace with confile file options -// we should really allow users to map any key to a joystick button using the keymapper. -#define JOY_DEADZONE 2200 - -#define JOY_XAXIS 0 -#define JOY_YAXIS 1 - -/* Quick default button states for modifiers. */ -int BUTTON_STATE_L = false; - -enum { - /* DPAD/Stick */ - BUTTON_UP = 0, - BUTTON_UPLEFT = 1, - BUTTON_LEFT = 2, - BUTTON_DOWNLEFT = 3, - BUTTON_DOWN = 4, - BUTTON_DOWNRIGHT = 5, - BUTTON_RIGHT = 6, - BUTTON_UPRIGHT = 7, - /* Joystick Buttons */ - BUTTON_MENU = 8, // Start on F100 GP2X - BUTTON_SELECT = 9, - BUTTON_L = 10, - BUTTON_R = 11, - BUTTON_A = 12, - BUTTON_B = 13, - BUTTON_X = 14, - BUTTON_Y = 15, - BUTTON_VOLUP = 16, - BUTTON_VOLDOWN = 17, - BUTTON_CLICK = 18 -}; - -enum { - /* Unused Joystick Buttons on the GP2X */ - BUTTON_HOME = 51, - BUTTON_HOLD = 52, - BUTTON_HELP = 53, - BUTTON_HELP2 = 54 -}; - -enum { - /* Touchscreen TapMode */ - TAPMODE_LEFT = 0, - TAPMODE_RIGHT = 1, - TAPMODE_HOVER = 2 -}; - -GP2XSdlEventSource::GP2XSdlEventSource() - : _buttonStateL(false){ -} - -void GP2XSdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) { - event.kbd.flags = 0; - - if (mod & KMOD_SHIFT) - event.kbd.flags |= Common::KBD_SHIFT; - if (mod & KMOD_ALT) - event.kbd.flags |= Common::KBD_ALT; - if (mod & KMOD_CTRL) - event.kbd.flags |= Common::KBD_CTRL; - - // Sticky flags - if (mod & KMOD_NUM) - event.kbd.flags |= Common::KBD_NUM; - if (mod & KMOD_CAPS) - event.kbd.flags |= Common::KBD_CAPS; -} - -void GP2XSdlEventSource::moveStick() { - bool stickBtn[32]; - - memcpy(stickBtn, _stickBtn, sizeof(stickBtn)); - - if ((stickBtn[0])||(stickBtn[2])||(stickBtn[4])||(stickBtn[6])) - stickBtn[1] = stickBtn[3] = stickBtn[5] = stickBtn[7] = 0; - - if ((stickBtn[1])||(stickBtn[2])||(stickBtn[3])) { - if (_km.x_down_count!=2) { - _km.x_vel = -1; - _km.x_down_count = 1; - } else - _km.x_vel = -4; - } else if ((stickBtn[5])||(stickBtn[6])||(stickBtn[7])) { - if (_km.x_down_count!=2) { - _km.x_vel = 1; - _km.x_down_count = 1; - } else - _km.x_vel = 4; - } else { - _km.x_vel = 0; - _km.x_down_count = 0; - } - - if ((stickBtn[0])||(stickBtn[1])||(stickBtn[7])) { - if (_km.y_down_count!=2) { - _km.y_vel = -1; - _km.y_down_count = 1; - } else - _km.y_vel = -4; - } else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])) { - if (_km.y_down_count!=2) { - _km.y_vel = 1; - _km.y_down_count = 1; - } else - _km.y_vel = 4; - } else { - _km.y_vel = 0; - _km.y_down_count = 0; - } -} - -/* GP2X Input mappings. -Single Button - -Movement: - -GP2X_BUTTON_UP Cursor Up -GP2X_BUTTON_DOWN Cursor Down -GP2X_BUTTON_LEFT Cursor Left -GP2X_BUTTON_RIGHT Cursor Right - -GP2X_BUTTON_UPLEFT Cursor Up Left -GP2X_BUTTON_UPRIGHT Cursor Up Right -GP2X_BUTTON_DOWNLEFT Cursor Down Left -GP2X_BUTTON_DOWNRIGHT Cursor Down Right - -Button Emulation: - -GP2X_BUTTON_CLICK Left Mouse Click (GP2X only) -GP2X_BUTTON_A . (Period) -GP2X_BUTTON_B Left Mouse Click -GP2X_BUTTON_Y Space Bar -GP2X_BUTTON_X Right Mouse Click -GP2X_BUTTON_L Combo Modifier (Left Trigger) -GP2X_BUTTON_R Return (Right Trigger) -GP2X_BUTTON_MENU F5 (Game Menu) -GP2X_BUTTON_SELECT Escape -GP2X_BUTTON_VOLUP /dev/mixer Global Volume Up -GP2X_BUTTON_VOLDOWN /dev/mixer Global Volume Down - -Combos: - -GP2X_BUTTON_VOLUP & GP2X_BUTTON_VOLDOWN 0 (For Monkey 2 CP) or Virtual Keyboard if enabled -GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed) -GP2X_BUTTON_L & GP2X_BUTTON_MENU Common::EVENT_MAINMENU (ScummVM Global Main Menu) -GP2X_BUTTON_L & GP2X_BUTTON_A Common::EVENT_PREDICTIVE_DIALOG for predictive text entry box (AGI games) -GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis. (GP2X only) -*/ - -bool GP2XSdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) { - SDLModToOSystemKeyFlags(SDL_GetModState(), event); - - if (remapKey(ev, event)) - return true; - - event.type = Common::EVENT_KEYDOWN; - event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym; - event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode); - - return true; -} - -bool GP2XSdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { - - _stickBtn[ev.jbutton.button] = 1; - event.kbd.flags = 0; - - switch (ev.jbutton.button) { - case BUTTON_UP: - case BUTTON_UPLEFT: - case BUTTON_LEFT: - case BUTTON_DOWNLEFT: - case BUTTON_DOWN: - case BUTTON_DOWNRIGHT: - case BUTTON_RIGHT: - case BUTTON_UPRIGHT: - moveStick(); - event.type = Common::EVENT_MOUSEMOVE; - fillMouseEvent(event, _km.x, _km.y); - break; - case BUTTON_B: - case BUTTON_CLICK: - if (BUTTON_STATE_L == true) { - ((GP2XSdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->toggleZoomOnMouse(); - fillMouseEvent(event, _km.x, _km.y); - } else { - event.type = Common::EVENT_LBUTTONDOWN; - fillMouseEvent(event, _km.x, _km.y); - } - break; - case BUTTON_X: - event.type = Common::EVENT_RBUTTONDOWN; - fillMouseEvent(event, _km.x, _km.y); - break; - case BUTTON_L: - BUTTON_STATE_L = true; - break; - case BUTTON_R: - event.type = Common::EVENT_KEYDOWN; - if (BUTTON_STATE_L == true) { -#ifdef ENABLE_VKEYBD - event.kbd.keycode = Common::KEYCODE_F7; - event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0); -#else - event.kbd.keycode = Common::KEYCODE_0; - event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0); -#endif - } else { - event.kbd.keycode = Common::KEYCODE_RETURN; - event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0); - } - break; - case BUTTON_SELECT: - case BUTTON_HOME: - event.type = Common::EVENT_KEYDOWN; - if (BUTTON_STATE_L == true) { - event.type = Common::EVENT_QUIT; - } else { - event.kbd.keycode = Common::KEYCODE_ESCAPE; - event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0); - } - break; - case BUTTON_A: - event.type = Common::EVENT_KEYDOWN; - if (BUTTON_STATE_L == true) { - event.type = Common::EVENT_PREDICTIVE_DIALOG; - } else { - event.kbd.keycode = Common::KEYCODE_PERIOD; - event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0); - } - break; - case BUTTON_Y: - event.type = Common::EVENT_KEYDOWN; - if (BUTTON_STATE_L == true) { - GPH::ToggleTapMode(); - if (GPH::tapmodeLevel == TAPMODE_LEFT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Left Click"); - } else if (GPH::tapmodeLevel == TAPMODE_RIGHT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Right Click"); - } else if (GPH::tapmodeLevel == TAPMODE_HOVER) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Hover (No Click)"); - } - } else { - event.kbd.keycode = Common::KEYCODE_SPACE; - event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0); - } - break; - case BUTTON_MENU: - case BUTTON_HELP: - event.type = Common::EVENT_KEYDOWN; - if (BUTTON_STATE_L == true) { - event.type = Common::EVENT_MAINMENU; - } else { - event.kbd.keycode = Common::KEYCODE_F5; - event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0); - } - break; - case BUTTON_VOLUP: - GP2X_HW::mixerMoveVolume(2); - if (GP2X_HW::volumeLevel == 100) { - g_system->displayMessageOnOSD("Maximum Volume"); - } else { - g_system->displayMessageOnOSD("Increasing Volume"); - } - break; - - case BUTTON_VOLDOWN: - GP2X_HW::mixerMoveVolume(1); - if (GP2X_HW::volumeLevel == 0) { - g_system->displayMessageOnOSD("Minimal Volume"); - } else { - g_system->displayMessageOnOSD("Decreasing Volume"); - } - break; - case BUTTON_HOLD: - event.type = Common::EVENT_QUIT; - break; - case BUTTON_HELP2: - GPH::ToggleTapMode(); - if (GPH::tapmodeLevel == TAPMODE_LEFT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode': Left Click"); - } else if (GPH::tapmodeLevel == TAPMODE_RIGHT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode': Right Click"); - } else if (GPH::tapmodeLevel == TAPMODE_HOVER) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode': Hover (No Click)"); - } - break; - } - return true; -} - -bool GP2XSdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { - _stickBtn[ev.jbutton.button] = 0; - event.kbd.flags = 0; - - switch (ev.jbutton.button) { - case BUTTON_UP: - case BUTTON_UPLEFT: - case BUTTON_LEFT: - case BUTTON_DOWNLEFT: - case BUTTON_DOWN: - case BUTTON_DOWNRIGHT: - case BUTTON_RIGHT: - case BUTTON_UPRIGHT: - moveStick(); - event.type = Common::EVENT_MOUSEMOVE; - fillMouseEvent(event, _km.x, _km.y); - break; - case BUTTON_B: - case BUTTON_CLICK: - if (BUTTON_STATE_L == true) { - break; - } else { - event.type = Common::EVENT_LBUTTONUP; - fillMouseEvent(event, _km.x, _km.y); - } - break; - case BUTTON_X: - event.type = Common::EVENT_RBUTTONUP; - fillMouseEvent(event, _km.x, _km.y); - break; - case BUTTON_L: - BUTTON_STATE_L = false; - break; - case BUTTON_SELECT: - case BUTTON_HOME: - event.type = Common::EVENT_KEYUP; - event.kbd.keycode = Common::KEYCODE_ESCAPE; - event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0); - break; - case BUTTON_A: - event.type = Common::EVENT_KEYUP; - event.kbd.keycode = Common::KEYCODE_PERIOD; - event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0); - break; - case BUTTON_Y: - event.type = Common::EVENT_KEYUP; - event.kbd.keycode = Common::KEYCODE_SPACE; - event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0); - break; - case BUTTON_MENU: - case BUTTON_HELP: - event.type = Common::EVENT_KEYUP; - if (BUTTON_STATE_L == true) { - event.type = Common::EVENT_MAINMENU; - } else { - event.kbd.keycode = Common::KEYCODE_F5; - event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0); - } - break; - case BUTTON_R: - event.type = Common::EVENT_KEYUP; - if (BUTTON_STATE_L == true) { -#ifdef ENABLE_VKEYBD - event.kbd.keycode = Common::KEYCODE_F7; - event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0); -#else - event.kbd.keycode = Common::KEYCODE_0; - event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0); -#endif - } else { - event.kbd.keycode = Common::KEYCODE_RETURN; - event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0); - } - break; - case BUTTON_VOLUP: - break; - case BUTTON_VOLDOWN: - break; - case BUTTON_HOLD: - break; - case BUTTON_HELP2: - break; - } - return true; -} - -bool GP2XSdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) { - int axis = ev.jaxis.value; - if ( axis > JOY_DEADZONE) { - axis -= JOY_DEADZONE; - event.type = Common::EVENT_MOUSEMOVE; - } else if ( axis < -JOY_DEADZONE ) { - axis += JOY_DEADZONE; - event.type = Common::EVENT_MOUSEMOVE; - } else - axis = 0; - - if ( ev.jaxis.axis == JOY_XAXIS) { -#ifdef JOY_ANALOG - _km.x_vel = axis/2000; - _km.x_down_count = 0; -#else - if (axis != 0) { - _km.x_vel = (axis > 0) ? 1:-1; - _km.x_down_count = 1; - } else { - _km.x_vel = 0; - _km.x_down_count = 0; - } -#endif - - } else if (ev.jaxis.axis == JOY_YAXIS) { -#ifndef JOY_INVERT_Y - axis = -axis; -#endif -#ifdef JOY_ANALOG - _km.y_vel = -axis / 2000; - _km.y_down_count = 0; -#else - if (axis != 0) { - _km.y_vel = (-axis > 0) ? 1: -1; - _km.y_down_count = 1; - } else { - _km.y_vel = 0; - _km.y_down_count = 0; - } -#endif - } - - fillMouseEvent(event, _km.x, _km.y); - return true; -} - -bool GP2XSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { - return false; -} - -#endif diff --git a/backends/events/gp2xsdl/gp2xsdl-events.h b/backends/events/gp2xsdl/gp2xsdl-events.h deleted file mode 100644 index 0d74c1bcac..0000000000 --- a/backends/events/gp2xsdl/gp2xsdl-events.h +++ /dev/null @@ -1,56 +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. - * - */ - -#if !defined(BACKEND_EVENTS_SDL_GP2X_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER) -#define BACKEND_EVENTS_SDL_GP2X_H - -#include "backends/events/sdl/sdl-events.h" - -/** - * SDL events manager for GP2X - */ -class GP2XSdlEventSource : public SdlEventSource { -public: - GP2XSdlEventSource(); - -protected: - bool _stickBtn[32]; - - /** Button state for L button modifier */ - bool _buttonStateL; - - /** - * Handles the stick movement - */ - void moveStick(); - - virtual bool handleKeyDown(SDL_Event &ev, Common::Event &event); - virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); - virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); - virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); - - virtual void SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event); - - virtual bool remapKey(SDL_Event &ev, Common::Event &event); -}; - -#endif diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp index d2b3483f84..b461f85fbb 100644 --- a/backends/events/gph/gph-events.cpp +++ b/backends/events/gph/gph-events.cpp @@ -34,6 +34,7 @@ #include "common/util.h" #include "common/events.h" +#include "common/translation.h" #define JOY_DEADZONE 2200 @@ -186,7 +187,6 @@ GPHEventSource::GPHEventSource() // } //} - void GPHEventSource::moveStick() { bool stickBtn[32]; @@ -363,11 +363,11 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { if (BUTTON_STATE_L == true) { GPH::ToggleTapMode(); if (GPH::tapmodeLevel == TAPMODE_LEFT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Left Click"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click")); } else if (GPH::tapmodeLevel == TAPMODE_RIGHT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Right Click"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Right Click")); } else if (GPH::tapmodeLevel == TAPMODE_HOVER) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Hover (No Click)"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (No Click)")); } } else { event.kbd.keycode = Common::KEYCODE_SPACE; @@ -387,17 +387,17 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { case BUTTON_VOLUP: WIZ_HW::mixerMoveVolume(2); if (WIZ_HW::volumeLevel == 100) { - g_system->displayMessageOnOSD("Maximum Volume"); + g_system->displayMessageOnOSD(_("Maximum Volume")); } else { - g_system->displayMessageOnOSD("Increasing Volume"); + g_system->displayMessageOnOSD(_("Increasing Volume")); } break; case BUTTON_VOLDOWN: WIZ_HW::mixerMoveVolume(1); if (WIZ_HW::volumeLevel == 0) { - g_system->displayMessageOnOSD("Minimal Volume"); + g_system->displayMessageOnOSD(_("Minimal Volume")); } else { - g_system->displayMessageOnOSD("Decreasing Volume"); + g_system->displayMessageOnOSD(_("Decreasing Volume")); } break; case BUTTON_HOLD: @@ -406,11 +406,11 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { case BUTTON_HELP2: GPH::ToggleTapMode(); if (GPH::tapmodeLevel == TAPMODE_LEFT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode': Left Click"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click")); } else if (GPH::tapmodeLevel == TAPMODE_RIGHT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode': Right Click"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Right Click")); } else if (GPH::tapmodeLevel == TAPMODE_HOVER) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode': Hover (No Click)"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (No Click)")); } break; } diff --git a/backends/events/openpandora/op-events.cpp b/backends/events/openpandora/op-events.cpp index 381cbf89e9..72bc56c95d 100644 --- a/backends/events/openpandora/op-events.cpp +++ b/backends/events/openpandora/op-events.cpp @@ -24,7 +24,6 @@ /* * OpenPandora: Device Specific Event Handling. - * */ #if defined(OPENPANDORA) @@ -34,6 +33,10 @@ #include "backends/platform/openpandora/op-sdl.h" #include "backends/platform/openpandora/op-options.h" +#include "common/translation.h" +#include "common/util.h" +#include "common/events.h" + /* Quick default button states for modifiers. */ int BUTTON_STATE_L = false; @@ -48,6 +51,68 @@ OPEventSource::OPEventSource() : _buttonStateL(false){ } +/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */ + +bool OPEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) { + if (ev.button.button == SDL_BUTTON_LEFT){ + if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */ + event.type = Common::EVENT_RBUTTONDOWN; + else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */ + event.type = Common::EVENT_LBUTTONDOWN; + else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */ + event.type = Common::EVENT_RBUTTONDOWN; + else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */ + event.type = Common::EVENT_MOUSEMOVE; + else + event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */ + } + else if (ev.button.button == SDL_BUTTON_RIGHT) + event.type = Common::EVENT_RBUTTONDOWN; +#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN) + else if (ev.button.button == SDL_BUTTON_WHEELUP) + event.type = Common::EVENT_WHEELUP; + else if (ev.button.button == SDL_BUTTON_WHEELDOWN) + event.type = Common::EVENT_WHEELDOWN; +#endif +#if defined(SDL_BUTTON_MIDDLE) + else if (ev.button.button == SDL_BUTTON_MIDDLE) + event.type = Common::EVENT_MBUTTONDOWN; +#endif + else + return false; + + fillMouseEvent(event, ev.button.x, ev.button.y); + + return true; +} + +bool OPEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) { + if (ev.button.button == SDL_BUTTON_LEFT){ + if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */ + event.type = Common::EVENT_RBUTTONUP; + else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */ + event.type = Common::EVENT_LBUTTONUP; + else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */ + event.type = Common::EVENT_RBUTTONUP; + else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */ + event.type = Common::EVENT_MOUSEMOVE; + else + event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */ + } + else if (ev.button.button == SDL_BUTTON_RIGHT) + event.type = Common::EVENT_RBUTTONUP; +#if defined(SDL_BUTTON_MIDDLE) + else if (ev.button.button == SDL_BUTTON_MIDDLE) + event.type = Common::EVENT_MBUTTONUP; +#endif + else + return false; + + fillMouseEvent(event, ev.button.x, ev.button.y); + + return true; +} + /* On the OpenPandora by default the ABXY and L/R Trigger buttons are returned by SDL as (A): SDLK_HOME (B): SDLK_END (X): SDLK_PAGEDOWN (Y): SDLK_PAGEUP (L): SDLK_RSHIFT (R): SDLK_RCTRL */ @@ -73,11 +138,11 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) { case SDLK_PAGEUP: OP::ToggleTapMode(); if (OP::tapmodeLevel == TAPMODE_LEFT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Left Click"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click")); } else if (OP::tapmodeLevel == TAPMODE_RIGHT) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Right Click"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Right Click")); } else if (OP::tapmodeLevel == TAPMODE_HOVER) { - g_system->displayMessageOnOSD("Touchscreen 'Tap Mode' - Hover (No Click)"); + g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (No Click)")); } break; case SDLK_RSHIFT: @@ -122,65 +187,4 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) { return false; } -/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */ - -bool OPEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) { - if (ev.button.button == SDL_BUTTON_LEFT){ - if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */ - event.type = Common::EVENT_RBUTTONDOWN; - else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */ - event.type = Common::EVENT_LBUTTONDOWN; - else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */ - event.type = Common::EVENT_RBUTTONDOWN; - else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */ - event.type = Common::EVENT_MOUSEMOVE; - else - event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */ - } - else if (ev.button.button == SDL_BUTTON_RIGHT) - event.type = Common::EVENT_RBUTTONDOWN; -#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN) - else if (ev.button.button == SDL_BUTTON_WHEELUP) - event.type = Common::EVENT_WHEELUP; - else if (ev.button.button == SDL_BUTTON_WHEELDOWN) - event.type = Common::EVENT_WHEELDOWN; -#endif -#if defined(SDL_BUTTON_MIDDLE) - else if (ev.button.button == SDL_BUTTON_MIDDLE) - event.type = Common::EVENT_MBUTTONDOWN; -#endif - else - return false; - - fillMouseEvent(event, ev.button.x, ev.button.y); - - return true; -} - -bool OPEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) { - if (ev.button.button == SDL_BUTTON_LEFT){ - if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */ - event.type = Common::EVENT_RBUTTONUP; - else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */ - event.type = Common::EVENT_LBUTTONUP; - else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */ - event.type = Common::EVENT_RBUTTONUP; - else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */ - event.type = Common::EVENT_MOUSEMOVE; - else - event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */ - } - else if (ev.button.button == SDL_BUTTON_RIGHT) - event.type = Common::EVENT_RBUTTONUP; -#if defined(SDL_BUTTON_MIDDLE) - else if (ev.button.button == SDL_BUTTON_MIDDLE) - event.type = Common::EVENT_MBUTTONUP; -#endif - else - return false; - - fillMouseEvent(event, ev.button.x, ev.button.y); - - return true; -} #endif diff --git a/backends/events/openpandora/op-events.h b/backends/events/openpandora/op-events.h index 9aa637992a..25f79e68d7 100644 --- a/backends/events/openpandora/op-events.h +++ b/backends/events/openpandora/op-events.h @@ -28,17 +28,22 @@ /** * Events manager for the OpenPandora. */ + class OPEventSource : public SdlEventSource { public: OPEventSource(); protected: - /** Button state for L button modifier */ + + /** + * Button state for L button modifier + */ bool _buttonStateL; - bool remapKey(SDL_Event &ev, Common::Event &event); + bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event); bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event); + bool remapKey(SDL_Event &ev, Common::Event &event); }; #endif /* BACKEND_EVENTS_OP_H */ diff --git a/backends/events/wincesdl/wincesdl-events.cpp b/backends/events/wincesdl/wincesdl-events.cpp index f15a416b76..4fab47a58e 100644 --- a/backends/events/wincesdl/wincesdl-events.cpp +++ b/backends/events/wincesdl/wincesdl-events.cpp @@ -35,7 +35,7 @@ WINCESdlEventSource::WINCESdlEventSource() : _tapTime(0), _closeClick(false), _rbutton(false), - _freeLook(false), _graphicsMan(0) { + _graphicsMan(0) { } void WINCESdlEventSource::init(WINCESdlGraphicsManager *graphicsMan) { @@ -64,6 +64,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { ev.type = SDL_NOEVENT; DWORD currentTime; bool keyEvent = false; + bool freeLookActive = _graphicsMan->getFreeLookState(); int deltaX, deltaY; memset(&event, 0, sizeof(Common::Event)); @@ -199,7 +200,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { } } - if (_freeLook && !_closeClick) { + if (freeLookActive && !_closeClick) { _rbutton = false; _tapTime = 0; _tapX = event.mouse.x; @@ -241,7 +242,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { fillMouseEvent(event, ev.button.x, ev.button.y); - if (_freeLook && !_closeClick) { + if (freeLookActive && !_closeClick) { _tapX = event.mouse.x; _tapY = event.mouse.y; event.type = Common::EVENT_MOUSEMOVE; @@ -322,8 +323,4 @@ int WINCESdlEventSource::mapKeyCE(SDLKey key, SDLMod mod, Uint16 unicode, bool u return key; } -void WINCESdlEventSource::swap_freeLook() { - _freeLook = !_freeLook; -} - #endif /* _WIN32_WCE */ diff --git a/backends/events/wincesdl/wincesdl-events.h b/backends/events/wincesdl/wincesdl-events.h index 734cc899c0..deeee6196c 100644 --- a/backends/events/wincesdl/wincesdl-events.h +++ b/backends/events/wincesdl/wincesdl-events.h @@ -45,8 +45,6 @@ public: // Overloaded from SDL backend (mouse and new scaler handling) void fillMouseEvent(Common::Event &event, int x, int y); - void swap_freeLook(); - protected: private: @@ -61,8 +59,6 @@ private: bool _closeClick; // flag when taps are spatially close together bool _rbutton; // double tap -> right button simulation - bool _freeLook; // freeLook mode (do not send mouse button events) - }; #endif diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 6c11ddc605..e3f282df05 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -602,35 +602,11 @@ size_t std_fread(void *ptr, size_t size, size_t numItems, FILE *handle) { } size_t std_fwrite(const void *ptr, size_t size, size_t numItems, FILE *handle) { - if ((handle == stdin)) - return 0; - - if ((handle == stderr) || (handle == stdout)) { -#ifndef DISABLE_TEXT_CONSOLE - nocashMessage((char *) ptr); -// consolePrintf((char *) ptr); -#endif - return size; - } - //consolePrintf("fwrite size=%d\n", size * numItems); if (DS::isGBAMPAvailable()) { FAT_fwrite(ptr, size, numItems, (FAT_FILE *) handle); return numItems; - - int length = size * numItems; - int pos = 0; - - while (pos < length) { - int amount = length > 512? 512: length; - - FAT_fwrite(((char *) (ptr)) + pos, 1, amount, (FAT_FILE *) handle); - length -= amount; - pos += amount; - } - - return numItems; } return 0; diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp index ccff8a8b42..829355be84 100644 --- a/backends/fs/posix/posix-fs-factory.cpp +++ b/backends/fs/posix/posix-fs-factory.cpp @@ -26,6 +26,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir +#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h #include "backends/fs/posix/posix-fs-factory.h" #include "backends/fs/posix/posix-fs.h" diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 08a7601c17..0b94c37b16 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -27,6 +27,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir #define FORBIDDEN_SYMBOL_EXCEPTION_getenv +#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h #include "backends/fs/posix/posix-fs.h" #include "backends/fs/stdiostream.h" diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp index 6690244fb7..8a141e97a5 100644 --- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp +++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp @@ -468,7 +468,7 @@ bool DINGUXSdlGraphicsManager::loadGFXMode() { bool DINGUXSdlGraphicsManager::hasFeature(OSystem::Feature f) { return (f == OSystem::kFeatureAspectRatioCorrection) || - (f == OSystem::kFeatureCursorHasPalette); + (f == OSystem::kFeatureCursorPalette); } void DINGUXSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { diff --git a/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp b/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp deleted file mode 100644 index 6e5a35a1b1..0000000000 --- a/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp +++ /dev/null @@ -1,180 +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 "common/scummsys.h" - -#if defined(GP2X_OLD) - -#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h" -#include "graphics/scaler/aspect.h" -#include <SDL_gp2x.h> - -static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { - {"Fullscreen", "1x", GFX_NORMAL}, - {0, 0, 0} -}; - -GP2XSdlGraphicsManager::GP2XSdlGraphicsManager(SdlEventSource *sdlEventSource) - : SdlGraphicsManager(sdlEventSource), _adjustZoomOnMouse(false) { -} - -const OSystem::GraphicsMode *GP2XSdlGraphicsManager::getSupportedGraphicsModes() const { - return s_supportedGraphicsModes; -} - -int GP2XSdlGraphicsManager::getDefaultGraphicsMode() const { - return GFX_NORMAL; -} - - -bool GP2XSdlGraphicsManager::hasFeature(OSystem::Feature f) { - if (f == OSystem::kFeatureIconifyWindow) - return false; - - return SdlGraphicsManager::hasFeature(f); -} - -void GP2XSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { - if (f != OSystem::kFeatureIconifyWindow) - SdlGraphicsManager::setFeatureState(f, enable); -} - -void GP2XSdlGraphicsManager::drawMouse() { - if (!_mouseVisible || !_mouseSurface) { - _mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0; - return; - } - - SDL_Rect zoomdst; - SDL_Rect dst; - int scale; - int hotX, hotY; - int tmpScreenWidth, tmpScreenHeight; - - // Temp vars to ensure we zoom to the LCD resolution or greater. - tmpScreenWidth = _videoMode.screenWidth; - tmpScreenHeight = _videoMode.screenHeight; - - if (_videoMode.screenHeight <= 240) { - tmpScreenHeight = 240; - } - - if (_videoMode.screenWidth <= 320) { - tmpScreenWidth = 320; - } - - dst.x = _mouseCurState.x; - dst.y = _mouseCurState.y; - - if (!_overlayVisible) { - scale = _videoMode.scaleFactor; - dst.w = _mouseCurState.vW; - dst.h = _mouseCurState.vH; - hotX = _mouseCurState.vHotX; - hotY = _mouseCurState.vHotY; - } else { - scale = 1; - dst.w = _mouseCurState.rW; - dst.h = _mouseCurState.rH; - hotX = _mouseCurState.rHotX; - hotY = _mouseCurState.rHotY; - } - - // The mouse is undrawn using virtual coordinates, i.e. they may be - // scaled and aspect-ratio corrected. - - _mouseBackup.x = dst.x - hotX; - _mouseBackup.y = dst.y - hotY; - _mouseBackup.w = dst.w; - _mouseBackup.h = dst.h; - - // We draw the pre-scaled cursor image, so now we need to adjust for - // scaling, shake position and aspect ratio correction manually. - - if (!_overlayVisible) { - dst.y += _currentShakePos; - } - - if (_videoMode.aspectRatioCorrection && !_overlayVisible) - dst.y = real2Aspect(dst.y); - - dst.x = scale * dst.x - _mouseCurState.rHotX; - dst.y = scale * dst.y - _mouseCurState.rHotY; - dst.w = _mouseCurState.rW; - dst.h = _mouseCurState.rH; - - // Hacking about with the zoom around mouse pointer stuff. - if (_adjustZoomOnMouse){ - - zoomdst.w = (tmpScreenWidth / 2); - zoomdst.h = (tmpScreenHeight / 2); - - // Create a zoomed rect centered on the mouse pointer. - // Will pan 1/4 of the screen. - - if (dst.x > ((tmpScreenWidth / 4) * 3)) { - zoomdst.x = (tmpScreenWidth / 2); - } else { - zoomdst.x = (dst.x - (tmpScreenWidth / 4)); - if (zoomdst.x < 0) { - zoomdst.x = 0; - } - } - - if (dst.y > ((tmpScreenHeight / 4) * 3)) { - zoomdst.y = (tmpScreenHeight / 2); - } else { - zoomdst.y = (dst.y - (tmpScreenHeight / 4)); - if (zoomdst.y < 0) { - zoomdst.y = 0; - } - } - SDL_GP2X_Display(&zoomdst); - } else { - - // Make sure we are looking at the whole screen otherwise. - - zoomdst.x = 0; - zoomdst.y = 0; - zoomdst.w = (tmpScreenWidth); - zoomdst.h = (tmpScreenHeight); - - SDL_GP2X_Display(&zoomdst); - }; - - // Note that SDL_BlitSurface() and addDirtyRect() will both perform any - // clipping necessary - - if (SDL_BlitSurface(_mouseSurface, NULL, _hwscreen, &dst) != 0) - error("SDL_BlitSurface failed: %s", SDL_GetError()); - - // The screen will be updated using real surface coordinates, i.e. - // they will not be scaled or aspect-ratio corrected. - - addDirtyRect(dst.x, dst.y, dst.w, dst.h, true); -} - -void GP2XSdlGraphicsManager::toggleZoomOnMouse() { - _adjustZoomOnMouse = !_adjustZoomOnMouse; -} - -#endif diff --git a/backends/graphics/gp2xsdl/gp2xsdl-graphics.h b/backends/graphics/gp2xsdl/gp2xsdl-graphics.h deleted file mode 100644 index 341b913acd..0000000000 --- a/backends/graphics/gp2xsdl/gp2xsdl-graphics.h +++ /dev/null @@ -1,46 +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. - * - */ - -#ifndef BACKENDS_GRAPHICS_SDL_GP2X_H -#define BACKENDS_GRAPHICS_SDL_GP2X_H - -#include "backends/graphics/sdl/sdl-graphics.h" - -class GP2XSdlGraphicsManager : public SdlGraphicsManager { -public: - GP2XSdlGraphicsManager(SdlEventSource *sdlEventSource); - - virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const; - virtual int getDefaultGraphicsMode() const; - virtual void drawMouse(); - - virtual bool hasFeature(OSystem::Feature f); - virtual void setFeatureState(OSystem::Feature f, bool enable); - - // Toggles zoom adjust on mouse - void toggleZoomOnMouse(); - -protected: - bool _adjustZoomOnMouse; -}; - -#endif diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp index b407bf1faf..eb748f2fc2 100644 --- a/backends/graphics/gph/gph-graphics.cpp +++ b/backends/graphics/gph/gph-graphics.cpp @@ -35,8 +35,8 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { {0, 0, 0} }; -GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *boss) - : SdlGraphicsManager(boss) { +GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *sdlEventSource) + : SdlGraphicsManager(sdlEventSource) { } const OSystem::GraphicsMode *GPHGraphicsManager::getSupportedGraphicsModes() const { @@ -110,21 +110,43 @@ void GPHGraphicsManager::setGraphicsModeIntern() { blitCursor(); } -void GPHGraphicsManager::initSize(uint w, uint h) { +void GPHGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFormat *format) { assert(_transactionMode == kTransactionActive); +#ifdef USE_RGB_COLOR + // Avoid redundant format changes + Graphics::PixelFormat newFormat; + if (!format) + newFormat = Graphics::PixelFormat::createFormatCLUT8(); + else + newFormat = *format; + + assert(newFormat.bytesPerPixel > 0); + + if (newFormat != _videoMode.format) { + _videoMode.format = newFormat; + _transactionDetails.formatChanged = true; + _screenFormat = newFormat; + } +#endif + + // Avoid redundant res changes if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight) return; _videoMode.screenWidth = w; _videoMode.screenHeight = h; + if (w > 320 || h > 240){ setGraphicsMode(GFX_HALF); setGraphicsModeIntern(); _sdlEventSource->toggleMouseGrab(); } + _videoMode.overlayWidth = 320; + _videoMode.overlayHeight = 240; + _transactionDetails.sizeChanged = true; } @@ -433,26 +455,65 @@ void GPHGraphicsManager::hideOverlay() { } -bool GPHGraphicsManager::loadGFXMode() { - - /* Forcefully disable aspect ratio correction for games - that start with a native 240px height resolution - This corrects games with non-standard resolutions - such as MM Nes (256x240). - */ +//bool GPHGraphicsManager::loadGFXMode() { + + +// _videoMode.overlayWidth = 320; +// _videoMode.overlayHeight = 240; +// _videoMode.fullscreen = true; +// +// /* Forcefully disable aspect ratio correction for games +// that start with a native 240px height resolution +// This corrects games with non-standard resolutions +// such as MM Nes (256x240). +// */ +// if(_videoMode.screenHeight == 240) { +// _videoMode.aspectRatioCorrection = false; +// } + +// debug("Game ScreenMode = %d*%d", _videoMode.screenWidth, _videoMode.screenHeight); +// if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) { +// _videoMode.aspectRatioCorrection = false; +// setGraphicsMode(GFX_HALF); +// debug("GraphicsMode set to HALF"); +// } else { +// setGraphicsMode(GFX_NORMAL); +// debug("GraphicsMode set to NORMAL"); +// } + + +// if ((_videoMode.mode == GFX_HALF) && !_overlayVisible) { +// //_videoMode.overlayWidth = _videoMode.screenWidth / 2; +// //_videoMode.overlayHeight = _videoMode.screenHeight / 2; +// _videoMode.overlayWidth = 320; +// _videoMode.overlayHeight = 240; +// _videoMode.fullscreen = true; +// } else { +// +// _videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor; +// _videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor; +// +// if (_videoMode.aspectRatioCorrection) +// _videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight); +// +// //_videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor; +// //_videoMode.hardwareHeight = effectiveScreenHeight(); +// _videoMode.hardwareWidth = 320; +// _videoMode.hardwareHeight = 240; +// +// } + +// return SdlGraphicsManager::loadGFXMode(); +//} - if(_videoMode.screenHeight == 240) { - _videoMode.aspectRatioCorrection = false; - } - - debug("Game ScreenMode = %d*%d", _videoMode.screenWidth, _videoMode.screenHeight); +bool GPHGraphicsManager::loadGFXMode() { if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) { _videoMode.aspectRatioCorrection = false; setGraphicsMode(GFX_HALF); - debug("GraphicsMode set to HALF"); +// printf("GFX_HALF\n"); } else { setGraphicsMode(GFX_NORMAL); - debug("GraphicsMode set to NORMAL"); +// printf("GFX_NORMAL\n"); } if ((_videoMode.mode == GFX_HALF) && !_overlayVisible) { @@ -476,7 +537,7 @@ bool GPHGraphicsManager::loadGFXMode() { bool GPHGraphicsManager::hasFeature(OSystem::Feature f) { return (f == OSystem::kFeatureAspectRatioCorrection) || - (f == OSystem::kFeatureCursorHasPalette); + (f == OSystem::kFeatureCursorPalette); } void GPHGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { diff --git a/backends/graphics/gph/gph-graphics.h b/backends/graphics/gph/gph-graphics.h index 6ba2b344a6..fc3dc5730d 100644 --- a/backends/graphics/gph/gph-graphics.h +++ b/backends/graphics/gph/gph-graphics.h @@ -24,7 +24,7 @@ #define BACKENDS_GRAPHICS_GPH_H #include "backends/graphics/sdl/sdl-graphics.h" -#include "graphics/scaler/aspect.h" // for aspect2Real +#include "graphics/scaler/aspect.h" // for aspect2Real #include "graphics/scaler/downscaler.h" enum { @@ -40,7 +40,7 @@ public: bool getFeatureState(OSystem::Feature f); int getDefaultGraphicsMode() const; - void initSize(uint w, uint h); + void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL); const OSystem::GraphicsMode *getSupportedGraphicsModes() const; bool setGraphicsMode(const char *name); bool setGraphicsMode(int mode); diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h index 4e681eb155..20924ed581 100644 --- a/backends/graphics/graphics.h +++ b/backends/graphics/graphics.h @@ -82,7 +82,6 @@ public: virtual void warpMouse(int x, int y) = 0; virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL) = 0; virtual void setCursorPalette(const byte *colors, uint start, uint num) = 0; - virtual void disableCursorPalette(bool disable) = 0; virtual void displayMessageOnOSD(const char *msg) {} }; diff --git a/backends/graphics/null/null-graphics.h b/backends/graphics/null/null-graphics.h index 673d59814e..28b24f6aca 100644 --- a/backends/graphics/null/null-graphics.h +++ b/backends/graphics/null/null-graphics.h @@ -79,7 +79,6 @@ public: void warpMouse(int x, int y) {} void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL) {} void setCursorPalette(const byte *colors, uint start, uint num) {} - void disableCursorPalette(bool disable) {} }; #endif diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index 32c0fbca6f..c0551de386 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -91,7 +91,7 @@ void OpenGLGraphicsManager::initEventObserver() { bool OpenGLGraphicsManager::hasFeature(OSystem::Feature f) { return (f == OSystem::kFeatureAspectRatioCorrection) || - (f == OSystem::kFeatureCursorHasPalette); + (f == OSystem::kFeatureCursorPalette); } void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { @@ -105,6 +105,11 @@ void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { _transactionDetails.needRefresh = true; break; + case OSystem::kFeatureCursorPalette: + _cursorPaletteDisabled = !enable; + _cursorNeedsRedraw = true; + break; + default: break; } @@ -118,6 +123,9 @@ bool OpenGLGraphicsManager::getFeatureState(OSystem::Feature f) { case OSystem::kFeatureAspectRatioCorrection: return _videoMode.aspectRatioCorrection; + case OSystem::kFeatureCursorPalette: + return !_cursorPaletteDisabled; + default: return false; } @@ -642,11 +650,6 @@ void OpenGLGraphicsManager::setCursorPalette(const byte *colors, uint start, uin _cursorNeedsRedraw = true; } -void OpenGLGraphicsManager::disableCursorPalette(bool disable) { - _cursorPaletteDisabled = disable; - _cursorNeedsRedraw = true; -} - // // Misc // @@ -1382,7 +1385,7 @@ const char *OpenGLGraphicsManager::getCurrentModeName() { #ifdef USE_OSD void OpenGLGraphicsManager::updateOSD() { // The font we are going to use: - const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kOSDFont); + const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kLocalizedFont); if (_osdSurface.w != _osdTexture->getWidth() || _osdSurface.h != _osdTexture->getHeight()) _osdSurface.create(_osdTexture->getWidth(), _osdTexture->getHeight(), _overlayFormat); diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index daba7748bc..463715aad8 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -107,7 +107,6 @@ public: virtual void warpMouse(int x, int y); virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL); virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool disable); virtual void displayMessageOnOSD(const char *msg); diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp index 3f9ffc9f3e..87457c3c08 100644 --- a/backends/graphics/openglsdl/openglsdl-graphics.cpp +++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp @@ -28,6 +28,7 @@ #include "backends/platform/sdl/sdl.h" #include "common/config-manager.h" #include "common/textconsole.h" +#include "common/translation.h" OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager() : @@ -394,7 +395,8 @@ void OpenGLSdlGraphicsManager::displayModeChangedMsg() { const int scaleFactor = getScale(); char buffer[128]; - sprintf(buffer, "Current display mode: %s\n%d x %d -> %d x %d", + sprintf(buffer, "%s: %s\n%d x %d -> %d x %d", + _("Current display mode"), newModeName, _videoMode.screenWidth * scaleFactor, _videoMode.screenHeight * scaleFactor, @@ -406,7 +408,8 @@ void OpenGLSdlGraphicsManager::displayModeChangedMsg() { void OpenGLSdlGraphicsManager::displayScaleChangedMsg() { char buffer[128]; const int scaleFactor = getScale(); - sprintf(buffer, "Current scale: x%d\n%d x %d -> %d x %d", + sprintf(buffer, "%s: x%d\n%d x %d -> %d x %d", + _("Current scale"), scaleFactor, _videoMode.screenWidth, _videoMode.screenHeight, _videoMode.overlayWidth, _videoMode.overlayHeight @@ -449,11 +452,13 @@ void OpenGLSdlGraphicsManager::toggleFullScreen(int loop) { #ifdef USE_OSD char buffer[128]; if (getFullscreenMode()) - sprintf(buffer, "Fullscreen mode\n%d x %d", + sprintf(buffer, "%s\n%d x %d", + _("Fullscreen mode"), _hwscreen->w, _hwscreen->h ); else - sprintf(buffer, "Windowed mode\n%d x %d", + sprintf(buffer, "%s\n%d x %d", + _("Windowed mode"), _hwscreen->w, _hwscreen->h ); displayMessageOnOSD(buffer); @@ -508,11 +513,13 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) { #ifdef USE_OSD char buffer[128]; if (getFeatureState(OSystem::kFeatureAspectRatioCorrection)) - sprintf(buffer, "Enabled aspect ratio correction\n%d x %d -> %d x %d", + sprintf(buffer, "%s\n%d x %d -> %d x %d", + _("Enabled aspect ratio correction"), _videoMode.screenWidth, _videoMode.screenHeight, _hwscreen->w, _hwscreen->h); else - sprintf(buffer, "Disabled aspect ratio correction\n%d x %d -> %d x %d", + sprintf(buffer, "%s\n%d x %d -> %d x %d", + _("Disabled aspect ratio correction"), _videoMode.screenWidth, _videoMode.screenHeight, _hwscreen->w, _hwscreen->h); displayMessageOnOSD(buffer); @@ -532,9 +539,9 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) { // modes we use, we might want to consider a better way of // displaying information to the user. if (getAntialiasingState()) - displayMessageOnOSD("Active filter mode: Linear"); + displayMessageOnOSD(_("Active filter mode: Linear")); else - displayMessageOnOSD("Active filter mode: Nearest"); + displayMessageOnOSD(_("Active filter mode: Nearest")); #endif return true; } diff --git a/backends/graphics/openpandora/op-graphics.cpp b/backends/graphics/openpandora/op-graphics.cpp index 20ee5dfc36..c8617635a5 100644 --- a/backends/graphics/openpandora/op-graphics.cpp +++ b/backends/graphics/openpandora/op-graphics.cpp @@ -26,15 +26,13 @@ #include "backends/graphics/openpandora/op-graphics.h" #include "backends/events/openpandora/op-events.h" -#include "backends/platform/openpandora/op-sdl.h" -#include "common/mutex.h" -#include "common/util.h" - +//#include "backends/platform/openpandora/op-sdl.h" #include "graphics/scaler/aspect.h" -#include "graphics/surface.h" +#include "common/mutex.h" +#include "common/textconsole.h" -OPGraphicsManager::OPGraphicsManager(SdlEventSource *boss) - : SdlGraphicsManager(boss) { +OPGraphicsManager::OPGraphicsManager(SdlEventSource *sdlEventSource) + : SdlGraphicsManager(sdlEventSource) { } bool OPGraphicsManager::loadGFXMode() { diff --git a/backends/graphics/openpandora/op-graphics.h b/backends/graphics/openpandora/op-graphics.h index b0d4298620..4bb89ca1e6 100644 --- a/backends/graphics/openpandora/op-graphics.h +++ b/backends/graphics/openpandora/op-graphics.h @@ -33,30 +33,30 @@ enum { class OPGraphicsManager : public SdlGraphicsManager { public: - OPGraphicsManager(SdlEventSource *boss); - - bool hasFeature(OSystem::Feature f); - void setFeatureState(OSystem::Feature f, bool enable); - bool getFeatureState(OSystem::Feature f); - int getDefaultGraphicsMode() const; - - void initSize(uint w, uint h); - const OSystem::GraphicsMode *getSupportedGraphicsModes() const; - bool setGraphicsMode(const char *name); - bool setGraphicsMode(int mode); - void setGraphicsModeIntern(); - void internUpdateScreen(); - void showOverlay(); - void hideOverlay(); + OPGraphicsManager(SdlEventSource *sdlEventSource); + +// bool hasFeature(OSystem::Feature f); +// void setFeatureState(OSystem::Feature f, bool enable); +// bool getFeatureState(OSystem::Feature f); +// int getDefaultGraphicsMode() const; + +// void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL); +// const OSystem::GraphicsMode *getSupportedGraphicsModes() const; +// bool setGraphicsMode(const char *name); +// bool setGraphicsMode(int mode); +// void setGraphicsModeIntern(); +// void internUpdateScreen(); +// void showOverlay(); +// void hideOverlay(); bool loadGFXMode(); - void drawMouse(); - void undrawMouse(); - virtual void warpMouse(int x, int y); +// void drawMouse(); +// void undrawMouse(); +// virtual void warpMouse(int x, int y); - SdlGraphicsManager::MousePos *getMouseCurState(); - SdlGraphicsManager::VideoState *getVideoMode(); +// SdlGraphicsManager::MousePos *getMouseCurState(); +// SdlGraphicsManager::VideoState *getVideoMode(); - virtual void adjustMouseEvent(const Common::Event &event); +// virtual void adjustMouseEvent(const Common::Event &event); }; #endif /* BACKENDS_GRAPHICS_OP_H */ diff --git a/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp b/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp index 18629d949a..f6832978a8 100644 --- a/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp +++ b/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp @@ -35,7 +35,7 @@ SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEven bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) { return (f == OSystem::kFeatureAspectRatioCorrection) || - (f == OSystem::kFeatureCursorHasPalette); + (f == OSystem::kFeatureCursorPalette); } void SamsungTVSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp index 7a5b777032..9063f55744 100644 --- a/backends/graphics/sdl/sdl-graphics.cpp +++ b/backends/graphics/sdl/sdl-graphics.cpp @@ -223,7 +223,7 @@ bool SdlGraphicsManager::hasFeature(OSystem::Feature f) { return (f == OSystem::kFeatureFullscreenMode) || (f == OSystem::kFeatureAspectRatioCorrection) || - (f == OSystem::kFeatureCursorHasPalette) || + (f == OSystem::kFeatureCursorPalette) || (f == OSystem::kFeatureIconifyWindow); } @@ -235,6 +235,10 @@ void SdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { case OSystem::kFeatureAspectRatioCorrection: setAspectRatioCorrection(enable); break; + case OSystem::kFeatureCursorPalette: + _cursorPaletteDisabled = !enable; + blitCursor(); + break; case OSystem::kFeatureIconifyWindow: if (enable) SDL_WM_IconifyWindow(); @@ -245,13 +249,15 @@ void SdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { } bool SdlGraphicsManager::getFeatureState(OSystem::Feature f) { - assert (_transactionMode == kTransactionNone); + assert(_transactionMode == kTransactionNone); switch (f) { case OSystem::kFeatureFullscreenMode: return _videoMode.fullscreen; case OSystem::kFeatureAspectRatioCorrection: return _videoMode.aspectRatioCorrection; + case OSystem::kFeatureCursorPalette: + return !_cursorPaletteDisabled; default: return false; } @@ -1458,11 +1464,6 @@ void SdlGraphicsManager::setCursorPalette(const byte *colors, uint start, uint n blitCursor(); } -void SdlGraphicsManager::disableCursorPalette(bool disable) { - _cursorPaletteDisabled = disable; - blitCursor(); -} - void SdlGraphicsManager::setShakePos(int shake_pos) { assert (_transactionMode == kTransactionNone); @@ -2059,7 +2060,7 @@ void SdlGraphicsManager::displayMessageOnOSD(const char *msg) { _osdSurface->format->Bshift, _osdSurface->format->Ashift); // The font we are going to use: - const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kOSDFont); + const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kLocalizedFont); // Clear everything with the "transparent" color, i.e. the colorkey SDL_FillRect(_osdSurface, 0, kOSDColorKey); @@ -2132,12 +2133,14 @@ bool SdlGraphicsManager::handleScalerHotkeys(Common::KeyCode key) { #ifdef USE_OSD char buffer[128]; if (_videoMode.aspectRatioCorrection) - sprintf(buffer, "Enabled aspect ratio correction\n%d x %d -> %d x %d", + sprintf(buffer, "%s\n%d x %d -> %d x %d", + _("Enabled aspect ratio correction"), _videoMode.screenWidth, _videoMode.screenHeight, _hwscreen->w, _hwscreen->h ); else - sprintf(buffer, "Disabled aspect ratio correction\n%d x %d -> %d x %d", + sprintf(buffer, "%s\n%d x %d -> %d x %d", + _("Disabled aspect ratio correction"), _videoMode.screenWidth, _videoMode.screenHeight, _hwscreen->w, _hwscreen->h ); @@ -2191,7 +2194,8 @@ bool SdlGraphicsManager::handleScalerHotkeys(Common::KeyCode key) { } if (newScalerName) { char buffer[128]; - sprintf(buffer, "Active graphics filter: %s\n%d x %d -> %d x %d", + sprintf(buffer, "%s %s\n%d x %d -> %d x %d", + _("Active graphics filter:"), newScalerName, _videoMode.screenWidth, _videoMode.screenHeight, _hwscreen->w, _hwscreen->h @@ -2245,9 +2249,9 @@ void SdlGraphicsManager::toggleFullScreen() { endGFXTransaction(); #ifdef USE_OSD if (_videoMode.fullscreen) - displayMessageOnOSD("Fullscreen mode"); + displayMessageOnOSD(_("Fullscreen mode")); else - displayMessageOnOSD("Windowed mode"); + displayMessageOnOSD(_("Windowed mode")); #endif } diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h index 86e52a0bf6..9627ab23a3 100644 --- a/backends/graphics/sdl/sdl-graphics.h +++ b/backends/graphics/sdl/sdl-graphics.h @@ -132,7 +132,6 @@ public: virtual void warpMouse(int x, int y); virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL); virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool disable); #ifdef USE_OSD virtual void displayMessageOnOSD(const char *msg); diff --git a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp index 4d656cd7cd..a88c8a8ffe 100644 --- a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp +++ b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp @@ -54,7 +54,7 @@ bool SymbianSdlGraphicsManager::hasFeature(OSystem::Feature f) { switch (f) { case OSystem::kFeatureFullscreenMode: case OSystem::kFeatureAspectRatioCorrection: - case OSystem::kFeatureCursorHasPalette: + case OSystem::kFeatureCursorPalette: #ifdef USE_VIBRA_SE_PXXX case OSystem::kFeatureVibration: #endif diff --git a/backends/graphics/wincesdl/wincesdl-graphics.cpp b/backends/graphics/wincesdl/wincesdl-graphics.cpp index 80b04ca56d..8ba7b5821d 100644 --- a/backends/graphics/wincesdl/wincesdl-graphics.cpp +++ b/backends/graphics/wincesdl/wincesdl-graphics.cpp @@ -49,8 +49,8 @@ WINCESdlGraphicsManager::WINCESdlGraphicsManager(SdlEventSource *sdlEventSource) _panelVisible(true), _saveActiveToolbar(NAME_MAIN_PANEL), _panelStateForced(false), _canBeAspectScaled(false), _scalersChanged(false), _saveToolbarState(false), _mouseBackupOld(NULL), _mouseBackupDim(0), _mouseBackupToolbar(NULL), - _usesEmulatedMouse(false), _forceHideMouse(false), _hasfocus(true), - _zoomUp(false), _zoomDown(false) { + _usesEmulatedMouse(false), _forceHideMouse(false), _freeLook(false), + _hasfocus(true), _zoomUp(false), _zoomDown(false) { memset(&_mouseCurState, 0, sizeof(_mouseCurState)); if (_isSmartphone) { _mouseCurState.x = 20; @@ -444,7 +444,6 @@ void WINCESdlGraphicsManager::update_game_settings() { // Skip panel->add(NAME_ITEM_SKIP, new CEGUI::ItemAction(ITEM_SKIP, POCKET_ACTION_SKIP)); // sound -//__XXX__ panel->add(NAME_ITEM_SOUND, new CEGUI::ItemSwitch(ITEM_SOUND_OFF, ITEM_SOUND_ON, &_soundMaster)); panel->add(NAME_ITEM_SOUND, new CEGUI::ItemSwitch(ITEM_SOUND_OFF, ITEM_SOUND_ON, &OSystem_WINCE3::_soundMaster)); // bind keys @@ -1627,6 +1626,14 @@ void WINCESdlGraphicsManager::create_toolbar() { _toolbarHandler.setVisible(false); } +void WINCESdlGraphicsManager::swap_freeLook() { + _freeLook = !_freeLook; +} + +bool WINCESdlGraphicsManager::getFreeLookState() { + return _freeLook; +} + WINCESdlGraphicsManager::zoneDesc WINCESdlGraphicsManager::_zones[TOTAL_ZONES] = { { 0, 0, 320, 145 }, { 0, 145, 150, 55 }, diff --git a/backends/graphics/wincesdl/wincesdl-graphics.h b/backends/graphics/wincesdl/wincesdl-graphics.h index b3a8d66f51..2727bc0d27 100644 --- a/backends/graphics/wincesdl/wincesdl-graphics.h +++ b/backends/graphics/wincesdl/wincesdl-graphics.h @@ -56,6 +56,8 @@ public: void unloadGFXMode(); bool hotswapGFXMode(); + void update_game_settings(); + // Overloaded from SDL backend (toolbar handling) void drawMouse(); // Overloaded from SDL backend (new scaler handling) @@ -88,7 +90,8 @@ public: void swap_zoom_up(); void swap_zoom_down(); void swap_mouse_visibility(); - + void swap_freeLook(); + bool getFreeLookState(); //#ifdef WIN32_PLATFORM_WFSP void move_cursor_up(); @@ -96,7 +99,6 @@ public: void move_cursor_left(); void move_cursor_right(); - void retrieve_mouse_location(int &x, int &y); void switch_zone(); void add_right_click(bool pushed); @@ -106,6 +108,11 @@ public: void smartphone_rotate_display(); //#endif + bool hasPocketPCResolution(); + bool hasDesktopResolution(); + bool hasSquareQVGAResolution(); + bool hasWideResolution() const; + bool _panelInitialized; // only initialize the toolbar once bool _noDoubleTapRMB; // disable double tap -> rmb click @@ -122,11 +129,6 @@ public: bool _hasfocus; // scummvm has the top window - bool hasPocketPCResolution(); - bool hasDesktopResolution(); - bool hasSquareQVGAResolution(); - bool hasWideResolution() const; - MousePos _mouseCurState; bool _zoomUp; // zooming up mode @@ -158,8 +160,8 @@ protected: private: bool update_scalers(); - void update_game_settings(); void drawToolbarMouse(SDL_Surface *surf, bool draw); + void retrieve_mouse_location(int &x, int &y); void create_toolbar(); bool _panelVisible; // panel visibility @@ -186,6 +188,7 @@ private: uint16 _mouseBackupDim; bool _forceHideMouse; // force invisible mouse cursor + bool _freeLook; // freeLook mode (do not send mouse button events) // Smartphone specific variables void loadDeviceConfigurationElement(Common::String element, int &value, int defaultValue); diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp index c5f147ffe1..525170d685 100644 --- a/backends/modular-backend.cpp +++ b/backends/modular-backend.cpp @@ -24,44 +24,25 @@ #include "backends/modular-backend.h" -#include "backends/fs/fs-factory.h" -#include "backends/audiocd/audiocd.h" #include "backends/graphics/graphics.h" #include "backends/mutex/mutex.h" #include "audio/mixer.h" -#include "common/events.h" -#include "gui/message.h" #include "graphics/pixelformat.h" ModularBackend::ModularBackend() : - _fsFactory(0), - _eventManager(0), - _savefileManager(0), - _timerManager(0), _mutexManager(0), _graphicsManager(0), - _mixer(0), - _audiocdManager(0) { + _mixer(0) { } ModularBackend::~ModularBackend() { - delete _fsFactory; - _fsFactory = 0; delete _graphicsManager; _graphicsManager = 0; - delete _eventManager; - _eventManager = 0; delete _mixer; _mixer = 0; - delete _audiocdManager; - _audiocdManager = 0; - delete _savefileManager; - _savefileManager = 0; - delete _timerManager; - _timerManager = 0; delete _mutexManager; _mutexManager = 0; } @@ -222,20 +203,6 @@ void ModularBackend::setCursorPalette(const byte *colors, uint start, uint num) _graphicsManager->setCursorPalette(colors, start, num); } -void ModularBackend::disableCursorPalette(bool disable) { - _graphicsManager->disableCursorPalette(disable); -} - -Common::TimerManager *ModularBackend::getTimerManager() { - assert(_timerManager); - return _timerManager; -} - -Common::EventManager *ModularBackend::getEventManager() { - assert(_eventManager); - return _eventManager; -} - OSystem::MutexRef ModularBackend::createMutex() { assert(_mutexManager); return _mutexManager->createMutex(); @@ -261,25 +228,10 @@ Audio::Mixer *ModularBackend::getMixer() { return (Audio::Mixer *)_mixer; } -AudioCDManager *ModularBackend::getAudioCDManager() { - assert(_audiocdManager); - return _audiocdManager; -} - void ModularBackend::displayMessageOnOSD(const char *msg) { _graphicsManager->displayMessageOnOSD(msg); } -Common::SaveFileManager *ModularBackend::getSavefileManager() { - assert(_savefileManager); - return _savefileManager; -} - -FilesystemFactory *ModularBackend::getFilesystemFactory() { - assert(_fsFactory); - return _fsFactory; -} - void ModularBackend::quit() { exit(0); } diff --git a/backends/modular-backend.h b/backends/modular-backend.h index e46fbfdd21..3593130bf5 100644 --- a/backends/modular-backend.h +++ b/backends/modular-backend.h @@ -23,9 +23,7 @@ #ifndef BACKENDS_MODULAR_BACKEND_H #define BACKENDS_MODULAR_BACKEND_H -#include "common/system.h" -#include "common/timer.h" -#include "common/savefile.h" +#include "backends/base-backend.h" class GraphicsManager; class MutexManager; @@ -39,8 +37,6 @@ class MutexManager; * A backend derivated from this class, will need to implement * these functions on its own: * OSystem::pollEvent() - * OSystem::createConfigReadStream() - * OSystem::createConfigWriteStream() * OSystem::getMillis() * OSystem::delayMillis() * OSystem::getTimeAndDate() @@ -48,7 +44,7 @@ class MutexManager; * And, it should also initialize all the managers variables * declared in this class, or override their related functions. */ -class ModularBackend : public OSystem { +class ModularBackend : public BaseBackend { public: ModularBackend(); virtual ~ModularBackend(); @@ -106,15 +102,12 @@ public: virtual void warpMouse(int x, int y); virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL); virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool disable); //@} /** @name Events and Time */ //@{ - virtual Common::TimerManager *getTimerManager(); - virtual Common::EventManager *getEventManager(); virtual Common::HardwareKeySet *getHardwareKeySet() { return 0; } //@} @@ -136,18 +129,9 @@ public: //@} - /** @name Audio CD */ - //@{ - - virtual AudioCDManager *getAudioCDManager(); - - //@} - /** @name Miscellaneous */ //@{ - virtual Common::SaveFileManager *getSavefileManager(); - virtual FilesystemFactory *getFilesystemFactory(); virtual void quit(); virtual void displayMessageOnOSD(const char *msg); @@ -157,14 +141,9 @@ protected: /** @name Managers variables */ //@{ - FilesystemFactory *_fsFactory; - Common::EventManager *_eventManager; - Common::SaveFileManager *_savefileManager; - Common::TimerManager *_timerManager; MutexManager *_mutexManager; GraphicsManager *_graphicsManager; Audio::Mixer *_mixer; - AudioCDManager *_audiocdManager; //@} }; diff --git a/backends/module.mk b/backends/module.mk index 27058bef88..d1feae4317 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -118,14 +118,6 @@ MODULE_OBJS += \ graphics/gph/gph-graphics.o endif -# TODO/FIXME: The gp2xsdl files are only compiled if GP2X_OLD is defined, -# which currently is never the case (unless the user manually requests it). -# ifeq ($(BACKEND),gp2x) -# MODULE_OBJS += \ -# events/gp2xsdl/gp2xsdl-events.o \ -# graphics/gp2xsdl/gp2xsdl-graphics.o -# endif - ifeq ($(BACKEND),linuxmoto) MODULE_OBJS += \ events/linuxmotosdl/linuxmotosdl-events.o \ diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index eeeddb4c77..90660cf82c 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -132,10 +132,7 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) : _show_mouse(false), _show_overlay(false), _enable_zoning(false), - _savefile(0), _mixer(0), - _timer(0), - _fsFactory(new POSIXFilesystemFactory()), _shake_offset(0), _event_queue_lock(createMutex()), _touch_pt_down(), @@ -149,6 +146,9 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) : _dpad_scale(4), _fingersDown(0), _trackball_scale(2) { + + _fsFactory = new POSIXFilesystemFactory(); + Common::String mf = getSystemProperty("ro.product.manufacturer"); LOGI("Running on: [%s] [%s] [%s] [%s] [%s] SDK:%s ABI:%s", @@ -170,17 +170,17 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) : OSystem_Android::~OSystem_Android() { ENTER(); - delete _savefile; - delete _timer; delete _mixer; + _mixer = 0; delete _fsFactory; + _fsFactory = 0; deleteMutex(_event_queue_lock); } void *OSystem_Android::timerThreadFunc(void *arg) { OSystem_Android *system = (OSystem_Android *)arg; - DefaultTimerManager *timer = (DefaultTimerManager *)(system->_timer); + DefaultTimerManager *timer = (DefaultTimerManager *)(system->_timerManager); // renice this thread to boost the audio thread if (setpriority(PRIO_PROCESS, 0, 19) < 0) @@ -359,8 +359,8 @@ void OSystem_Android::initBackend() { // BUG: "transient" ConfMan settings get nuked by the options // screen. Passing the savepath in this way makes it stick // (via ConfMan.registerDefault) - _savefile = new DefaultSaveFileManager(ConfMan.get("savepath")); - _timer = new DefaultTimerManager(); + _savefileManager = new DefaultSaveFileManager(ConfMan.get("savepath")); + _timerManager = new DefaultTimerManager(); gettimeofday(&_startTime, 0); @@ -388,6 +388,8 @@ void OSystem_Android::initBackend() { warning("couldn't renice the main thread"); JNI::setReadyForEvents(true); + + EventsBaseBackend::initBackend(); } void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const { @@ -399,7 +401,7 @@ void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const { bool OSystem_Android::hasFeature(Feature f) { return (f == kFeatureFullscreenMode || f == kFeatureAspectRatioCorrection || - f == kFeatureCursorHasPalette || + f == kFeatureCursorPalette || f == kFeatureVirtualKeyboard || f == kFeatureOverlaySupportsAlpha); } @@ -420,6 +422,11 @@ void OSystem_Android::setFeatureState(Feature f, bool enable) { _virtkeybd_on = enable; showVirtualKeyboard(enable); break; + case kFeatureCursorPalette: + _use_mouse_palette = !enable; + if (!enable) + disableCursorPalette(); + break; default: break; } @@ -433,6 +440,8 @@ bool OSystem_Android::getFeatureState(Feature f) { return _ar_correction; case kFeatureVirtualKeyboard: return _virtkeybd_on; + case kFeatureCursorPalette: + return _use_mouse_palette; default: return false; } @@ -526,21 +535,11 @@ void OSystem_Android::showVirtualKeyboard(bool enable) { JNI::showVirtualKeyboard(enable); } -Common::SaveFileManager *OSystem_Android::getSavefileManager() { - assert(_savefile); - return _savefile; -} - Audio::Mixer *OSystem_Android::getMixer() { assert(_mixer); return _mixer; } -Common::TimerManager *OSystem_Android::getTimerManager() { - assert(_timer); - return _timer; -} - void OSystem_Android::getTimeAndDate(TimeDate &td) const { struct tm tm; const time_t curTime = time(0); @@ -554,10 +553,6 @@ void OSystem_Android::getTimeAndDate(TimeDate &td) const { td.tm_year = tm.tm_year; } -FilesystemFactory *OSystem_Android::getFilesystemFactory() { - return _fsFactory; -} - void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { ENTER(""); @@ -568,6 +563,10 @@ void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s, void OSystem_Android::logMessage(LogMessageType::Type type, const char *message) { switch (type) { + case LogMessageType::kInfo: + __android_log_write(ANDROID_LOG_INFO, android_log_tag, message); + break; + case LogMessageType::kDebug: __android_log_write(ANDROID_LOG_DEBUG, android_log_tag, message); break; diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 752a31a4db..c2ada2ab77 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -103,7 +103,7 @@ protected: }; #endif -class OSystem_Android : public BaseBackend, public PaletteManager { +class OSystem_Android : public EventsBaseBackend, public PaletteManager { private: // passed from the dark side int _audio_sample_rate; @@ -152,10 +152,7 @@ private: bool _enable_zoning; bool _virtkeybd_on; - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - Common::TimerManager *_timer; - FilesystemFactory *_fsFactory; timeval _startTime; Common::String getSystemProperty(const char *name) const; @@ -237,6 +234,7 @@ private: void clipMouse(Common::Point &p); void scaleMouse(Common::Point &p, int x, int y, bool deductDrawRect = true); void updateEventScale(); + void disableCursorPalette(); protected: // PaletteManager API @@ -272,7 +270,6 @@ public: int cursorTargetScale, const Graphics::PixelFormat *format); virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool disable); virtual bool pollEvent(Common::Event &event); virtual uint32 getMillis(); @@ -289,11 +286,8 @@ public: virtual void displayMessageOnOSD(const char *msg); virtual void showVirtualKeyboard(bool enable); - virtual Common::SaveFileManager *getSavefileManager(); virtual Audio::Mixer *getMixer(); virtual void getTimeAndDate(TimeDate &t) const; - virtual Common::TimerManager *getTimerManager(); - virtual FilesystemFactory *getFilesystemFactory(); virtual void logMessage(LogMessageType::Type type, const char *message); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index 89e918a34e..b8a9e74437 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -801,12 +801,10 @@ void OSystem_Android::setCursorPalette(const byte *colors, _use_mouse_palette = true; } -void OSystem_Android::disableCursorPalette(bool disable) { - ENTER("%d", disable); - +void OSystem_Android::disableCursorPalette() { // when disabling the cursor palette, and we're running a clut8 game, // it expects the game palette to be used for the cursor - if (disable && _game_texture->hasPalette()) { + if (_game_texture->hasPalette()) { const byte *src = _game_texture->palette_const(); byte *dst = _mouse_texture_palette->palette(); @@ -825,8 +823,6 @@ void OSystem_Android::disableCursorPalette(bool disable) { byte *p = _mouse_texture_palette->palette() + _mouse_keycolor * 2; WRITE_UINT16(p, READ_UINT16(p) & ~1); } - - _use_mouse_palette = !disable; } #endif diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp index 16547456c3..ac709f62b9 100644 --- a/backends/platform/dc/dc-fs.cpp +++ b/backends/platform/dc/dc-fs.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h +#define FORBIDDEN_SYMBOL_ALLOW_ALL #include "dc.h" #include "backends/fs/abstract-fs.h" diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index e31b817d7c..bde50daa2d 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -70,7 +70,7 @@ class DCCDManager : public DefaultAudioCDManager { void updateCD(); }; -class OSystem_Dreamcast : private DCHardware, public BaseBackend, public PaletteManager, public FilesystemFactory +class OSystem_Dreamcast : private DCHardware, public EventsBaseBackend, public PaletteManager, public FilesystemFactory #ifdef DYNAMIC_MODULES , public FilePluginProvider #endif @@ -145,9 +145,6 @@ public: // Replace the specified range of cursor the palette with new colors. void setCursorPalette(const byte *colors, uint start, uint num); - // Disable or enable cursor palette. - void disableCursorPalette(bool disable); - // Shaking is used in SCUMM. Set current shake position. void setShakePos(int shake_pos); @@ -164,8 +161,6 @@ public: // Returns true if an event was retrieved. bool pollEvent(Common::Event &event); - AudioCDManager *getAudioCDManager() { return _cdManager; } - // Quit void quit(); @@ -190,26 +185,20 @@ public: void setWindowCaption(const char *caption); // Modulatized backend - Common::SaveFileManager *getSavefileManager() { return _savefile; } Audio::Mixer *getMixer() { return _mixer; } - Common::TimerManager *getTimerManager() { return _timer; } // Extra SoftKbd support void mouseToSoftKbd(int x, int y, int &rx, int &ry) const; // Filesystem - FilesystemFactory *getFilesystemFactory() { return this; } AbstractFSNode *makeRootFileNode() const; AbstractFSNode *makeCurrentDirectoryFileNode() const; AbstractFSNode *makeFileNodePath(const Common::String &path) const; private: - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - DefaultTimerManager *_timer; SoftKeyboard _softkbd; - DCCDManager *_cdManager; int _ms_cur_x, _ms_cur_y, _ms_cur_w, _ms_cur_h, _ms_old_x, _ms_old_y; int _ms_hotspot_x, _ms_hotspot_y, _ms_visible, _devpoll, _last_screen_refresh; diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index dfce176e90..3faf0185ad 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -20,10 +20,7 @@ * */ -// Allow use of stuff in <time.h> -#define FORBIDDEN_SYMBOL_EXCEPTION_time_h - -#define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_ALLOW_ALL #include <common/scummsys.h> #include <engines/engine.h> @@ -44,26 +41,29 @@ const char *gGameName; OSystem_Dreamcast::OSystem_Dreamcast() : _devpoll(0), screen(NULL), mouse(NULL), overlay(NULL), _softkbd(this), - _ms_buf(NULL), _timer(NULL), _mixer(NULL), _savefile(NULL), + _ms_buf(NULL), _mixer(NULL), _current_shake_pos(0), _aspect_stretch(false), _softkbd_on(false), _softkbd_motion(0), _enable_cursor_palette(false), _screenFormat(0) { memset(screen_tx, 0, sizeof(screen_tx)); memset(mouse_tx, 0, sizeof(mouse_tx)); memset(ovl_tx, 0, sizeof(ovl_tx)); + _fsFactory = this; } void OSystem_Dreamcast::initBackend() { ConfMan.setInt("autosave_period", 0); - _savefile = createSavefileManager(); - _timer = new DefaultTimerManager(); + _savefileManager = createSavefileManager(); + _timerManager = new DefaultTimerManager(); uint sampleRate = initSound(); _mixer = new Audio::MixerImpl(this, sampleRate); _mixer->setReady(true); - _cdManager = new DCCDManager(); + _audiocdManager = new DCCDManager(); + + EventsBaseBackend::initBackend(); } @@ -163,7 +163,7 @@ bool OSystem_Dreamcast::hasFeature(Feature f) case kFeatureAspectRatioCorrection: case kFeatureVirtualKeyboard: case kFeatureOverlaySupportsAlpha: - case kFeatureCursorHasPalette: + case kFeatureCursorPalette: return true; default: return false; @@ -181,6 +181,9 @@ void OSystem_Dreamcast::setFeatureState(Feature f, bool enable) case kFeatureVirtualKeyboard: _softkbd_on = enable; break; + case kFeatureCursorPalette: + _enable_cursor_palette = enable; + break; default: break; } @@ -193,6 +196,8 @@ bool OSystem_Dreamcast::getFeatureState(Feature f) return _aspect_stretch; case kFeatureVirtualKeyboard: return _softkbd_on; + case kFeatureCursorPalette: + return _enable_cursor_palette; default: return false; } diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index 56eef870c0..a11e329df3 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -171,11 +171,6 @@ void OSystem_Dreamcast::setCursorPalette(const byte *colors, uint start, uint nu _enable_cursor_palette = true; } -void OSystem_Dreamcast::disableCursorPalette(bool disable) -{ - _enable_cursor_palette = !disable; -} - void OSystem_Dreamcast::grabPalette(byte *colors, uint start, uint num) { const unsigned short *src = palette + start; diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp index 7054ad196e..3759eec6df 100644 --- a/backends/platform/dc/input.cpp +++ b/backends/platform/dc/input.cpp @@ -192,8 +192,8 @@ bool OSystem_Dreamcast::pollEvent(Common::Event &event) { unsigned int t = Timer(); - if (_timer != NULL) - _timer->handler(); + if (_timerManager != NULL) + ((DefaultTimerManager *)_timerManager)->handler(); if (((int)(t-_devpoll))<0) return false; diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp index c343852321..8cc3a71e8d 100644 --- a/backends/platform/dc/time.cpp +++ b/backends/platform/dc/time.cpp @@ -48,8 +48,8 @@ void OSystem_Dreamcast::delayMillis(uint msecs) unsigned int t, start = Timer(); int time = (((unsigned int)msecs)*3125U)>>6; while (((int)((t = Timer())-start))<time) { - if (_timer != NULL) - _timer->handler(); + if (_timerManager != NULL) + ((DefaultTimerManager *)_timerManager)->handler(); checkSound(); } getMillis(); diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index f18f69efa6..e06dd7fa43 100644 --- a/backends/platform/dc/vmsave.cpp +++ b/backends/platform/dc/vmsave.cpp @@ -20,10 +20,7 @@ * */ -// Allow use of stuff in <time.h> -#define FORBIDDEN_SYMBOL_EXCEPTION_time_h - -#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf +#define FORBIDDEN_SYMBOL_ALLOW_ALL #include <common/scummsys.h> #include "engines/engine.h" diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 462990cb32..b157a3a87a 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -41,6 +41,9 @@ #include "touchkeyboard.h" #include "backends/fs/ds/ds-fs-factory.h" +#include "backends/audiocd/default/default-audiocd.h" +#include "backends/timer/default/default-timer.h" + #ifdef ENABLE_AGI #include "wordcompletion.h" #endif @@ -79,7 +82,7 @@ OSystem_DS *OSystem_DS::_instance = NULL; OSystem_DS::OSystem_DS() - : eventNum(0), lastPenFrame(0), queuePos(0), _mixer(NULL), _timer(NULL), _frameBufferExists(false), + : eventNum(0), lastPenFrame(0), queuePos(0), _mixer(NULL), _frameBufferExists(false), _disableCursorPalette(true), _graphicsEnable(true), _gammaValue(0) { // eventNum = 0; @@ -87,13 +90,17 @@ OSystem_DS::OSystem_DS() // queuePos = 0; _instance = this; // _mixer = NULL; - // _timer = NULL; //_frameBufferExists = false; } OSystem_DS::~OSystem_DS() { delete _mixer; - delete _timer; + _mixer = 0; + + // If _savefileManager is not 0, then it points to the OSystem_DS + // member variable mpSaveManager. Hence we set _savefileManager to + // 0, to prevent the OSystem destructor from trying to delete it. + _savefileManager = 0; } int OSystem_DS::timerHandler(int t) { @@ -106,7 +113,11 @@ void OSystem_DS::initBackend() { ConfMan.setInt("autosave_period", 0); ConfMan.setBool("FM_medium_quality", true); - _timer = new DefaultTimerManager(); + if (DS::isGBAMPAvailable()) { + _savefileManager = &mpSaveManager; + } + + _timerManager = new DefaultTimerManager(); DS::setTimerCallback(&OSystem_DS::timerHandler, 10); if (ConfMan.hasKey("22khzaudio", "ds") && ConfMan.getBool("22khzaudio", "ds")) { @@ -118,21 +129,32 @@ void OSystem_DS::initBackend() { _mixer = new Audio::MixerImpl(this, DS::getSoundFrequency()); _mixer->setReady(true); - OSystem::initBackend(); + /* TODO/FIXME: The NDS should use a custom AudioCD manager instance! + if (!_audiocdManager) + _audiocdManager = new DSAudioCDManager(); + */ + + EventsBaseBackend::initBackend(); } bool OSystem_DS::hasFeature(Feature f) { - return (f == kFeatureVirtualKeyboard) || (f == kFeatureCursorHasPalette); + return (f == kFeatureVirtualKeyboard) || (f == kFeatureCursorPalette); } void OSystem_DS::setFeatureState(Feature f, bool enable) { if (f == kFeatureVirtualKeyboard) DS::setKeyboardIcon(enable); + else if (f == kFeatureCursorPalette) { + _disableCursorPalette = !enable; + refreshCursor(); + } } bool OSystem_DS::getFeatureState(Feature f) { if (f == kFeatureVirtualKeyboard) return DS::getKeyboardIcon(); + if (f == kFeatureCursorPalette) + return !_disableCursorPalette; return false; } @@ -734,14 +756,6 @@ void OSystem_DS::quit() { swiSoftReset();*/ } -Common::SaveFileManager *OSystem_DS::getSavefileManager() { - if (DS::isGBAMPAvailable()) { - return &mpSaveManager; - } - return NULL; -} - - Graphics::Surface *OSystem_DS::createTempFrameBuffer() { // Ensure we copy using 16 bit quantities due to limitation of VRAM addressing @@ -840,16 +854,15 @@ void OSystem_DS::setCharactersEntered(int count) { DS::setCharactersEntered(count); } -Common::SeekableReadStream *OSystem_DS::createConfigReadStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); -// consolePrintf("R %s", DEFAULT_CONFIG_FILE); - return file.createReadStream(); +Common::String OSystem_DS::getDefaultConfigFileName() { + return DEFAULT_CONFIG_FILE; } -Common::WriteStream *OSystem_DS::createConfigWriteStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); -// consolePrintf("W %s", DEFAULT_CONFIG_FILE); - return file.createWriteStream(); +void OSystem_DS::logMessage(LogMessageType::Type type, const char *message) { +#ifndef DISABLE_TEXT_CONSOLE + nocashMessage((char *)message); +// consolePrintf((char *)message); +#endif } u16 OSystem_DS::applyGamma(u16 color) { diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index 4ab2e36322..b1222a152d 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -29,13 +29,12 @@ #include "nds.h" #include "gbampsave.h" #include "backends/saves/default/default-saves.h" -#include "backends/timer/default/default-timer.h" #include "audio/mixer_intern.h" #include "graphics/surface.h" #include "graphics/colormasks.h" #include "graphics/palette.h" -class OSystem_DS : public BaseBackend, public PaletteManager { +class OSystem_DS : public EventsBaseBackend, public PaletteManager { protected: int eventNum; @@ -46,7 +45,6 @@ protected: GBAMPSaveFileManager mpSaveManager; Audio::MixerImpl *_mixer; - DefaultTimerManager *_timer; Graphics::Surface _framebuffer; bool _frameBufferExists; bool _graphicsEnable; @@ -140,8 +138,6 @@ public: virtual void quit(); - virtual Common::SaveFileManager *getSavefileManager(); - void addEvent(const Common::Event& e); bool isEventQueueEmpty() const { return queuePos == 0; } @@ -159,7 +155,6 @@ public: virtual Audio::Mixer *getMixer() { return _mixer; } Audio::MixerImpl *getMixerImpl() { return _mixer; } - virtual Common::TimerManager *getTimerManager() { return _timer; } static int timerHandler(int t); @@ -172,14 +167,13 @@ public: virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool dis) { _disableCursorPalette = dis; refreshCursor(); } - - FilesystemFactory *getFilesystemFactory(); + virtual FilesystemFactory *getFilesystemFactory(); void refreshCursor(); - Common::WriteStream *createConfigWriteStream(); - Common::SeekableReadStream *createConfigReadStream(); + virtual Common::String getDefaultConfigFileName(); + + virtual void logMessage(LogMessageType::Type type, const char *message); u16 applyGamma(u16 color); void setGammaValue(int gamma) { _gammaValue = gamma; } diff --git a/backends/platform/gp2x/build/clean.sh b/backends/platform/gp2x/build/clean.sh deleted file mode 100755 index 0979f6c7d6..0000000000 --- a/backends/platform/gp2x/build/clean.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -echo Quick script to make building all the time less painful. - -# Set the paths up here to support the build. - -export PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH -export PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH -export CXX=arm-open2x-linux-g++ -export CC=arm-open2x-linux-gcc -export CXXFLAGS=-march=armv4t -export LDFLAGS=-static - -cd ../../../.. - -echo Cleaning ScummVM for GP2X. -make clean diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h deleted file mode 100644 index 7efdd7164c..0000000000 --- a/backends/platform/gp2x/gp2x-common.h +++ /dev/null @@ -1,49 +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. - * - */ - -#ifndef PLATFORM_SDL_GP2X_H -#define PLATFORM_SDL_GP2X_H - -#include "backends/base-backend.h" -#include "backends/platform/sdl/sdl.h" -#include "backends/platform/sdl/posix/posix.h" -#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h" -#include "backends/events/gp2xsdl/gp2xsdl-events.h" - -#ifndef PATH_MAX - #define PATH_MAX 255 -#endif - -class OSystem_GP2X : public OSystem_POSIX { -public: - OSystem_GP2X() {} - - void initBackend(); - void quit(); - void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); - void initSDL(); - -protected: - -}; - -#endif diff --git a/backends/platform/gp2x/gp2x-hw.cpp b/backends/platform/gp2x/gp2x-hw.cpp deleted file mode 100644 index 074c668b5f..0000000000 --- a/backends/platform/gp2x/gp2x-hw.cpp +++ /dev/null @@ -1,228 +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. - * - */ - -/* - * GP2X: Hardware Stuff. - * Thanks to Rlyeh, Snaff, Squidge, Hermes, PS2Reality and RobBrown - * for there help with us all getting to grips with this. - * - */ - -// Disable symbol overrides so that we can use system headers. -#define FORBIDDEN_SYMBOL_ALLOW_ALL - -#include "gp2x-common.h" - -#include "gp2x-hw.h" -#include "gp2x-mem.h" - -// Linux includes to let us goof about with the system in a 'standard' way. -#include <fcntl.h> -#include <pthread.h> -#include <signal.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <sys/mman.h> -#include <sys/ioctl.h> -#include <sys/soundcard.h> -#include <sys/time.h> -#include <unistd.h> - -extern "C" { -static unsigned long gp2x_dev[8]={0,0,0,0,0,0,0,0};//, gp2x_ticks_per_second; -} - -namespace GP2X_HW { - -enum { - VOLUME_NOCHG = 0, - VOLUME_DOWN = 1, - VOLUME_UP = 2, - VOLUME_CHANGE_RATE = 8, - VOLUME_MIN = 0, - VOLUME_INITIAL = 60, - VOLUME_MAX = 100 -}; - -int volumeLevel = VOLUME_INITIAL; - -/* system registers */ -static struct -{ - unsigned short SYSCLKENREG,SYSCSETREG,FPLLVSETREG,DUALINT920,DUALINT940,DUALCTRL940; -} -system_reg; - -static unsigned short dispclockdiv; - -static volatile unsigned short *MEM_REG; - -#define SYS_CLK_FREQ 7372800 - -void deviceInit() { - // Open devices - if (!gp2x_dev[0]) gp2x_dev[0] = open("/dev/mixer", O_RDWR); - if (!gp2x_dev[1]) gp2x_dev[1] = open("/dev/batt", O_RDONLY); - if (!gp2x_dev[2]) gp2x_dev[2] = open("/dev/mem", O_RDWR); -} - -void deviceDeinit() { - // Close devices - { - int i; - for (i=0;i<8;i++) - { - if (gp2x_dev[i]) - { - close(gp2x_dev[i]); - } - } - } - - MEM_REG[0x91c>>1] = system_reg.SYSCSETREG; - MEM_REG[0x910>>1] = system_reg.FPLLVSETREG; - MEM_REG[0x3B40>>1] = system_reg.DUALINT920; - MEM_REG[0x3B42>>1] = system_reg.DUALINT940; - MEM_REG[0x3B48>>1] = system_reg.DUALCTRL940; - MEM_REG[0x904>>1] = system_reg.SYSCLKENREG; - MEM_REG[0x924>>1] = dispclockdiv; - - unpatchMMU(); -} - -void mixerMoveVolume(int direction) { - if (volumeLevel <= 10) { - if (direction == VOLUME_UP) volumeLevel += VOLUME_CHANGE_RATE/2; - if (direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE/2; - } else { - if(direction == VOLUME_UP) volumeLevel += VOLUME_CHANGE_RATE; - if(direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE; - } - - if (volumeLevel < VOLUME_MIN) volumeLevel = VOLUME_MIN; - if (volumeLevel > VOLUME_MAX) volumeLevel = VOLUME_MAX; - - unsigned long soundDev = open("/dev/mixer", O_RDWR); - - if(soundDev) { - int vol = ((volumeLevel << 8) | volumeLevel); - ioctl(soundDev, SOUND_MIXER_WRITE_PCM, &vol); - close(soundDev); - } -} - -void setCpuspeed(unsigned int mhz) -{ - set_FCLK(mhz); - set_DCLK_Div(0); - set_920_Div(0); -} - -int getBattLevel() { - int devbatt; - unsigned short currentval=0; - devbatt = open("/dev/batt", O_RDONLY); - read (devbatt, ¤tval, 2); - close (devbatt); - return (currentval); -} - -void set_display_clock_div(unsigned div) -{ - div=((div & 63) | 64)<<8; - MEM_REG[0x924>>1]=(MEM_REG[0x924>>1] & ~(255<<8)) | div; -} - - -void set_FCLK(unsigned MHZ) -{ - unsigned v; - unsigned mdiv,pdiv=3,scale=0; - MHZ*=1000000; - mdiv=(MHZ*pdiv)/SYS_CLK_FREQ; - mdiv=((mdiv-8)<<8) & 0xff00; - pdiv=((pdiv-2)<<2) & 0xfc; - scale&=3; - v=mdiv | pdiv | scale; - MEM_REG[0x910>>1]=v; -} - - -void set_920_Div(unsigned short div) -{ - unsigned short v; - v = MEM_REG[0x91c>>1] & (~0x3); - MEM_REG[0x91c>>1] = (div & 0x7) | v; -} - - -void set_DCLK_Div( unsigned short div ) -{ - unsigned short v; - v = (unsigned short)( MEM_REG[0x91c>>1] & (~(0x7 << 6)) ); - MEM_REG[0x91c>>1] = ((div & 0x7) << 6) | v; -} - - -void Disable_940(void) -{ - MEM_REG[0x3B42>>1]; - MEM_REG[0x3B42>>1]=0; - MEM_REG[0x3B46>>1]=0xffff; - MEM_REG[0x3B48>>1]|= (1 << 7); - MEM_REG[0x904>>1]&=0xfffe; -} - -void gp2x_video_wait_vsync(void) -{ - MEM_REG[0x2846>>1]=(MEM_REG[0x2846>>1] | 0x20) & ~2; - while (!(MEM_REG[0x2846>>1] & 2)); -} - -} /* namespace GP2X_HW */ - -namespace GPH { - -enum { - /* Touchscreen TapMode */ - TAPMODE_LEFT = 0, - TAPMODE_RIGHT = 1, - TAPMODE_HOVER = 2 -}; - -int tapmodeLevel = TAPMODE_LEFT; - -void ToggleTapMode() { - if (tapmodeLevel == TAPMODE_LEFT) { - tapmodeLevel = TAPMODE_RIGHT; - } else if (tapmodeLevel == TAPMODE_RIGHT) { - tapmodeLevel = TAPMODE_HOVER; - } else if (tapmodeLevel == TAPMODE_HOVER) { - tapmodeLevel = TAPMODE_LEFT; - } else { - tapmodeLevel = TAPMODE_LEFT; - } -} - - -} /* namespace GPH */ diff --git a/backends/platform/gp2x/gp2x-hw.h b/backends/platform/gp2x/gp2x-hw.h deleted file mode 100644 index 3c66400124..0000000000 --- a/backends/platform/gp2x/gp2x-hw.h +++ /dev/null @@ -1,62 +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. - * - */ - -/* - * GP2X: Hardware Stuff. - * - */ - -#ifndef GP2X_HW_H -#define GP2X_HW_H - -namespace GP2X_HW { - -#define GP2X_MAXVOL 100 // Highest level permitted by GP2X's mixer -#define SYS_CLK_FREQ 7372800 // Clock Frequency - -extern int volumeLevel; - -extern void deviceInit(); -extern void deviceDeinit(); -extern void mixerMoveVolume(int); -extern void setCpuspeed(unsigned int cpuspeed); -extern int getBattLevel(); - -extern void save_system_regs(void); /* save some registers */ -extern void set_display_clock_div(unsigned div); -extern void set_FCLK(unsigned MHZ); /* adjust the clock frequency (in Mhz units) */ -extern void set_920_Div(unsigned short div); /* 0 to 7 divider (freq=FCLK/(1+div)) */ -extern void set_DCLK_Div(unsigned short div); /* 0 to 7 divider (freq=FCLK/(1+div)) */ -extern void Disable_940(void); /* 940t down */ -extern void gp2x_video_wait_vsync(void); - -} /* namespace GP2X_HW */ - -namespace GPH { - -extern int tapmodeLevel; - -extern void ToggleTapMode(); - -} /* namespace GPH */ - -#endif //GP2X_HW_H diff --git a/backends/platform/gp2x/gp2x-main.cpp b/backends/platform/gp2x/gp2x-main.cpp deleted file mode 100644 index f1ee5ed5f3..0000000000 --- a/backends/platform/gp2x/gp2x-main.cpp +++ /dev/null @@ -1,50 +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 "backends/platform/gp2x/gp2x-common.h" -#include "backends/plugins/sdl/sdl-provider.h" -#include "base/main.h" - -#if defined(GP2X) -int main(int argc, char *argv[]) { - - // Create our OSystem instance - g_system = new OSystem_GP2X(); - assert(g_system); - - // Pre initialize the backend - ((OSystem_GP2X *)g_system)->init(); - -#ifdef DYNAMIC_MODULES - PluginManager::instance().addPluginProvider(new SDLPluginProvider()); -#endif - - // Invoke the actual ScummVM main entry point: - int res = scummvm_main(argc, argv); - - // Free OSystem - delete (OSystem_GP2X *)g_system; - - return res; -} - -#endif diff --git a/backends/platform/gp2x/gp2x-mem.cpp b/backends/platform/gp2x/gp2x-mem.cpp deleted file mode 100644 index 8d22bf8130..0000000000 --- a/backends/platform/gp2x/gp2x-mem.cpp +++ /dev/null @@ -1,84 +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. - * - */ - -/* - * GP2X: Memory tweaking stuff. - * - */ - -// Disable symbol overrides so that we can use system headers. -#define FORBIDDEN_SYMBOL_ALLOW_ALL - -#include <stdio.h> -#include <signal.h> -#include <setjmp.h> -#include <stdlib.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <unistd.h> -#include <string.h> - -#include "backends/platform/gp2x/gp2x-mem.h" - -extern "C" { -static volatile unsigned short *gp2x_memregs; -} - -void SetClock (unsigned c) { - unsigned v; - unsigned mdiv,pdiv=3,scale=0; - - // Set ARM920t clock - c *= 1000000; - mdiv = (c*pdiv) / SYS_CLK_FREQ; - mdiv = ((mdiv-8)<<8) & 0xff00; - pdiv = ((pdiv-2)<<2) & 0xfc; - scale &= 3; - v = mdiv | pdiv | scale; - gp2x_memregs[0x910>>1] = v; -} - -void patchMMU (void) { - //volatile unsigned int *secbuf = (unsigned int *)malloc (204800); - - printf ("Reconfiguring cached memory regions...\n"); - - //hackpgtable(); - //printf ("Sucess...\n"); - - system("/sbin/rmmod mmuhack"); - system("/sbin/insmod -f mmuhack.o"); - - int mmufd = open("/dev/mmuhack", O_RDWR); - - if(mmufd < 0) { - printf ("Upper memory uncached (attempt failed, access to upper memory will be slower)...\n"); - } else { - printf ("Upper memory cached...\n"); - close(mmufd); - } -} - -void unpatchMMU (void) { - printf ("Restoreing cached memory regions...\n"); - system("/sbin/rmmod mmuhack"); -} diff --git a/backends/platform/gp2x/gp2x-mem.h b/backends/platform/gp2x/gp2x-mem.h deleted file mode 100644 index b2cd00a587..0000000000 --- a/backends/platform/gp2x/gp2x-mem.h +++ /dev/null @@ -1,51 +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. - * - */ - -/* - * GP2X: Memory Stuff. - * - */ - -#ifndef GP2X_MEM_H -#define GP2X_MEM_H - -#ifdef __cplusplus -extern "C" { -#endif - -// Use Squidge's MMU patch rather then myown (his is neater). -// The effect if not that great but cacheing the upper RAM is no bad thing (tm) ;). - -//extern void InitRam (void); -//extern void CloseRam (void); -// Set ARM920t clock frequency -extern void SetClock (unsigned c); -extern void patchMMU (void); -extern void unpatchMMU (void); - -#define SYS_CLK_FREQ 7372800 - -#ifdef __cplusplus - } -#endif - -#endif //GP2X_MEM_H diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp deleted file mode 100644 index 0e28a6b738..0000000000 --- a/backends/platform/gp2x/gp2x.cpp +++ /dev/null @@ -1,208 +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. - * - */ - -/* - * GP2X: Main backend. - * - */ - -// Disable symbol overrides so that we can use system headers. -#define FORBIDDEN_SYMBOL_ALLOW_ALL - -#include "backends/platform/sdl/sdl-sys.h" -#include "backends/platform/gp2x/gp2x-common.h" -#include "backends/platform/gp2x/gp2x-hw.h" -#include "backends/platform/gp2x/gp2x-mem.h" - -#include "backends/saves/default/default-saves.h" - -#include "common/config-manager.h" -#include "common/debug.h" - -// Disable for normal serial logging. -#define DUMP_STDOUT - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> -#include <errno.h> -#include <sys/stat.h> - -void OSystem_GP2X::initBackend() { - // Setup default save path to be workingdir/saves - char savePath[PATH_MAX + 1]; - char workDirName[PATH_MAX + 1]; - - if (getcwd(workDirName, PATH_MAX) == NULL) { - error("Could not obtain current working directory"); - } else { - printf("Current working directory: %s\n", workDirName); - } - - strcpy(savePath, workDirName); - strcat(savePath, "/saves"); - printf("Current save directory: %s\n", savePath); - struct stat sb; - if (stat(savePath, &sb) == -1) - if (errno == ENOENT) // Create the dir if it does not exist - if (mkdir(savePath, 0755) != 0) - warning("mkdir for '%s' failed", savePath); - - ConfMan.registerDefault("savepath", savePath); - - #ifdef DUMP_STDOUT - // The GP2X has a serial console but most users do not use this so we - // output all our STDOUT and STDERR to files for debug purposes. - char STDOUT_FILE[PATH_MAX + 1]; - char STDERR_FILE[PATH_MAX + 1]; - - strcpy(STDOUT_FILE, workDirName); - strcpy(STDERR_FILE, workDirName); - strcat(STDOUT_FILE, "/scummvm.stdout.txt"); - strcat(STDERR_FILE, "/scummvm.stderr.txt"); - - /* Flush the output in case anything is queued */ - fclose(stdout); - fclose(stderr); - - /* Redirect standard input and standard output */ - FILE *newfp = freopen(STDOUT_FILE, "w", stdout); - if (newfp == NULL) { - #if !defined(stdout) - stdout = fopen(STDOUT_FILE, "w"); - #else - newfp = fopen(STDOUT_FILE, "w"); - if (newfp) { - *stdout = *newfp; - } - #endif - } - - newfp = freopen(STDERR_FILE, "w", stderr); - if (newfp == NULL) { - #if !defined(stderr) - stderr = fopen(STDERR_FILE, "w"); - #else - newfp = fopen(STDERR_FILE, "w"); - if (newfp) { - *stderr = *newfp; - } - #endif - } - - setbuf(stderr, NULL); - printf("%s\n", "Debug: STDOUT and STDERR redirected to text files."); - #endif /* DUMP_STDOUT */ - - // Setup other defaults. - ConfMan.registerDefault("aspect_ratio", true); - - /* Up default volume values as we use a seperate system level volume anyway. */ - ConfMan.registerDefault("music_volume", 192); - ConfMan.registerDefault("sfx_volume", 192); - ConfMan.registerDefault("speech_volume", 192); - ConfMan.registerDefault("autosave_period", 3 * 60); // Trigger autosave every 3 minutes - On low batts 4 mins is about your warning time. - - ConfMan.setBool("FM_low_quality", true); - - /* Initialize any GP2X specific stuff we may want (Batt Status, scaler etc.) */ - GP2X_HW::deviceInit(); - - /* Set Default hardware mixer volume to a preset level (VOLUME_INITIAL). This is done to 'reset' volume level if set by other apps. */ - GP2X_HW::mixerMoveVolume(0); - - // Create the events manager - if (_eventSource == 0) - _eventSource = new GP2XSdlEventSource(); - - // Create the graphics manager - if (_graphicsManager == 0) - _graphicsManager = new GP2XSdlGraphicsManager(_eventSource); - - /* Pass to POSIX method to do the heavy lifting */ - OSystem_POSIX::initBackend(); -} - -void OSystem_GP2X::initSDL() { - // Check if SDL has not been initialized - if (!_initedSDL) { - uint32 sdlFlags = SDL_INIT_EVENTTHREAD; - if (ConfMan.hasKey("disable_sdl_parachute")) - sdlFlags |= SDL_INIT_NOPARACHUTE; - - // Initialize SDL (SDL Subsystems are initiliazed in the corresponding sdl managers) - if (SDL_Init(sdlFlags) == -1) - error("Could not initialize SDL: %s", SDL_GetError()); - - // Enable unicode support if possible - SDL_EnableUNICODE(1); - - _initedSDL = true; - } -} - -void OSystem_GP2X::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { - /* Setup default extra data paths for engine data files and plugins */ - char workDirName[PATH_MAX + 1]; - - if (getcwd(workDirName, PATH_MAX) == NULL) { - error("Error: Could not obtain current working directory"); - } - - Common::FSNode workdirNode(workDirName); - if (workdirNode.exists() && workdirNode.isDirectory()) { - s.add("__GP2X_WORKDIR__", new Common::FSDirectory(workDirName), priority); - } - - char enginedataPath[PATH_MAX+1]; - - strcpy(enginedataPath, workDirName); - strcat(enginedataPath, "/engine-data"); - - Common::FSNode engineNode(enginedataPath); - if (engineNode.exists() && engineNode.isDirectory()) { - s.add("__GP2X_ENGDATA__", new Common::FSDirectory(enginedataPath), priority); - } - - char pluginsPath[PATH_MAX+1]; - - strcpy(pluginsPath, workDirName); - strcat(pluginsPath, "/plugins"); - - Common::FSNode pluginsNode(pluginsPath); - if (pluginsNode.exists() && pluginsNode.isDirectory()) { - s.add("__GP2X_PLUGINS__", new Common::FSDirectory(pluginsPath), priority); - } -} - -void OSystem_GP2X::quit() { - GP2X_HW::deviceDeinit(); - - #ifdef DUMP_STDOUT - printf("%s\n", "Debug: STDOUT and STDERR text files closed."); - fclose(stdout); - fclose(stderr); - #endif /* DUMP_STDOUT */ - - OSystem_POSIX::quit(); -} diff --git a/backends/platform/gp2x/module.mk b/backends/platform/gp2x/module.mk deleted file mode 100644 index 4846f162cb..0000000000 --- a/backends/platform/gp2x/module.mk +++ /dev/null @@ -1,15 +0,0 @@ -MODULE := backends/platform/gp2x - -MODULE_OBJS := \ - gp2x-hw.o \ - gp2x-main.o \ - gp2x-mem.o \ - gp2x.o - -# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. -MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) -OBJS := $(MODULE_OBJS) $(OBJS) -MODULE_DIRS += $(sort $(dir $(MODULE_OBJS))) - -# Hack to ensure the SDL backend is built so we can use OSystem_SDL. --include $(srcdir)/backends/platform/sdl/module.mk diff --git a/backends/platform/gph/build/gp2x-config.sh b/backends/platform/gph/build/gp2x-config.sh index f474c4d0d4..a9b28b2fd0 100644 --- a/backends/platform/gph/build/gp2x-config.sh +++ b/backends/platform/gph/build/gp2x-config.sh @@ -23,8 +23,9 @@ cd ../../../.. --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \ --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \ --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \ - --enable-vkeybd --enable-plugins --default-dynamic -# --disable-release --enable-debug + --enable-vkeybd + # --enable-plugins --default-dynamic +# --disable-release --enable-debug echo Generating config for GP2X complete. Check for errors. diff --git a/backends/platform/gph/devices/gp2x/scummvm.gpe b/backends/platform/gph/devices/gp2x/scummvm.gpe index e8983aa2ce..51a49f7560 100644 --- a/backends/platform/gph/devices/gp2x/scummvm.gpe +++ b/backends/platform/gph/devices/gp2x/scummvm.gpe @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Remount SD with forced Sync, does this really work? mount -o sync,remount /dev/mmcsd/disc0/part1 /mnt/sd/ @@ -8,7 +8,7 @@ mount -o sync,remount /dev/mmcsd/disc0/part1 /mnt/sd/ export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH # Run ScummVM, important this bit. -./scummvm.gph +./scummvm.gph --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc # Sync the SD card to check that everything is written. sync diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp index cb52da441d..ae3466b836 100644 --- a/backends/platform/gph/gph-backend.cpp +++ b/backends/platform/gph/gph-backend.cpp @@ -56,8 +56,15 @@ /* Dump console info to files. */ #define DUMP_STDOUT +OSystem_GPH::OSystem_GPH() + : + OSystem_POSIX() { +} + void OSystem_GPH::initBackend() { + assert(!_inited); + // Create the events manager if (_eventSource == 0) _eventSource = new GPHEventSource(); @@ -81,7 +88,7 @@ void OSystem_GPH::initBackend() { char workDirName[PATH_MAX+1]; if (getcwd(workDirName, PATH_MAX) == NULL) { - error("Could not obtain current working directory"); + error("Could not obtain current working directory."); } else { printf("Current working directory: %s\n", workDirName); } @@ -155,7 +162,8 @@ void OSystem_GPH::initBackend() { /* Trigger autosave every 4 minutes - On low batts 5 mins is about your warning time. */ ConfMan.registerDefault("autosave_period", 4 * 60); - /* Make sure that aspect ratio correction is enabled on the 1st run to stop users asking me what the 'wasted space' is ;-). */ + /* Make sure that aspect ratio correction is enabled on the 1st run to stop + users asking me what the 'wasted space' at the bottom is ;-). */ ConfMan.registerDefault("aspect_ratio", true); /* Make sure SDL knows that we have a joystick we want to use. */ @@ -164,10 +172,10 @@ void OSystem_GPH::initBackend() { /* Now setup any device specific user options (Left handed mode, that sort of thing). */ // GPH::setOptions(); - printf("%s\n", "Passing to OSystem::SDL initBackend."); - /* Pass to POSIX method to do the heavy lifting */ OSystem_POSIX::initBackend(); + + _inited = true; } void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { @@ -176,7 +184,7 @@ void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) char workDirName[PATH_MAX+1]; if (getcwd(workDirName, PATH_MAX) == NULL) { - error("Error: Could not obtain current working directory"); + error("Error: Could not obtain current working directory."); } Common::FSNode workdirNode(workDirName); @@ -215,5 +223,5 @@ void OSystem_GPH::quit() { fclose(stderr); #endif /* DUMP_STDOUT */ - OSystem_SDL::quit(); + OSystem_POSIX::quit(); } diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp index f91ec8f478..1a8c6686ca 100644 --- a/backends/platform/gph/gph-main.cpp +++ b/backends/platform/gph/gph-main.cpp @@ -21,7 +21,7 @@ */ #include "backends/platform/gph/gph-sdl.h" -#include "backends/plugins/sdl/sdl-provider.h" +#include "backends/plugins/posix/posix-provider.h" #include "base/main.h" #if defined(GPH_DEVICE) @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { ((OSystem_GPH *)g_system)->init(); #ifdef DYNAMIC_MODULES - PluginManager::instance().addPluginProvider(new SDLPluginProvider()); + PluginManager::instance().addPluginProvider(new POSIXPluginProvider()); #endif // Invoke the actual ScummVM main entry point: diff --git a/backends/platform/gph/gph-sdl.h b/backends/platform/gph/gph-sdl.h index 68a641eed7..8b943f98f3 100644 --- a/backends/platform/gph/gph-sdl.h +++ b/backends/platform/gph/gph-sdl.h @@ -28,8 +28,8 @@ #include "backends/base-backend.h" #include "backends/platform/sdl/sdl.h" #include "backends/platform/sdl/posix/posix.h" -#include "backends/graphics/gph/gph-graphics.h" #include "backends/events/gph/gph-events.h" +#include "backends/graphics/gph/gph-graphics.h" #define __GP2XWIZ__ @@ -39,6 +39,8 @@ class OSystem_GPH : public OSystem_POSIX { public: + OSystem_GPH(); + /* Platform Setup Stuff */ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority); void initBackend(); diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h index 8e0ffc19cb..223f025978 100644 --- a/backends/platform/iphone/iphone_video.h +++ b/backends/platform/iphone/iphone_video.h @@ -67,6 +67,7 @@ - (void)updateMainSurface; - (void)updateOverlaySurface; - (void)updateMouseSurface; +- (void)clearColorBuffer; -(void)updateMouseCursor; diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m index 006603df64..04d25cebf8 100644 --- a/backends/platform/iphone/iphone_video.m +++ b/backends/platform/iphone/iphone_video.m @@ -85,6 +85,8 @@ void iPhone_setMouseCursor(short* buffer, int width, int height) { void iPhone_enableOverlay(int state) { _overlayIsEnabled = state; + + [sharedInstance performSelectorOnMainThread:@selector(clearColorBuffer) withObject:nil waitUntilDone: YES]; } int iPhone_getScreenHeight() { @@ -478,12 +480,7 @@ bool getLocalMouseCoords(CGPoint *point) { glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer); printOpenGLError(); - // The color buffer is triple-buffered, so we clear it multiple times right away to avid doing any glClears later. - int clearCount = 5; - while (clearCount-- > 0) { - glClear(GL_COLOR_BUFFER_BIT); printOpenGLError(); - [_context presentRenderbuffer:GL_RENDERBUFFER_OES]; - } + [self clearColorBuffer]; if (_keyboardView != nil) { [_keyboardView removeFromSuperview]; @@ -535,6 +532,15 @@ bool getLocalMouseCoords(CGPoint *point) { } } +- (void)clearColorBuffer { + // The color buffer is triple-buffered, so we clear it multiple times right away to avid doing any glClears later. + int clearCount = 5; + while (clearCount-- > 0) { + glClear(GL_COLOR_BUFFER_BIT); printOpenGLError(); + [_context presentRenderbuffer:GL_RENDERBUFFER_OES]; + } +} + - (id)getEvent { if (_events == nil || [_events count] == 0) { return nil; diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index 12317ad935..9325ed50bf 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -53,7 +53,7 @@ SoundProc OSystem_IPHONE::s_soundCallback = NULL; void *OSystem_IPHONE::s_soundParam = NULL; OSystem_IPHONE::OSystem_IPHONE() : - _savefile(NULL), _mixer(NULL), _timer(NULL), _offscreen(NULL), + _mixer(NULL), _offscreen(NULL), _overlayVisible(false), _fullscreen(NULL), _mouseHeight(0), _mouseWidth(0), _mouseBuf(NULL), _lastMouseTap(0), _queuedEventTime(0), _secondaryTapped(false), _lastSecondaryTap(0), @@ -72,10 +72,7 @@ OSystem_IPHONE::OSystem_IPHONE() : OSystem_IPHONE::~OSystem_IPHONE() { AudioQueueDispose(s_AudioQueue.queue, true); - delete _fsFactory; - delete _savefile; delete _mixer; - delete _timer; delete _offscreen; delete _fullscreen; } @@ -88,12 +85,12 @@ int OSystem_IPHONE::timerHandler(int t) { void OSystem_IPHONE::initBackend() { #ifdef IPHONE_OFFICIAL - _savefile = new DefaultSaveFileManager(iPhone_getDocumentsDir()); + _savefileManager = new DefaultSaveFileManager(iPhone_getDocumentsDir()); #else - _savefile = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); + _savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); #endif - _timer = new DefaultTimerManager(); + _timerManager = new DefaultTimerManager(); gettimeofday(&_startTime, NULL); @@ -101,7 +98,7 @@ void OSystem_IPHONE::initBackend() { setTimerCallback(&OSystem_IPHONE::timerHandler, 10); - OSystem::initBackend(); + EventsBaseBackend::initBackend(); } bool OSystem_IPHONE::hasFeature(Feature f) { @@ -210,48 +207,25 @@ void OSystem_IPHONE::getTimeAndDate(TimeDate &td) const { td.tm_year = t.tm_year; } -Common::SaveFileManager *OSystem_IPHONE::getSavefileManager() { - assert(_savefile); - return _savefile; -} - Audio::Mixer *OSystem_IPHONE::getMixer() { assert(_mixer); return _mixer; } -Common::TimerManager *OSystem_IPHONE::getTimerManager() { - assert(_timer); - return _timer; -} - OSystem *OSystem_IPHONE_create() { return new OSystem_IPHONE(); } -Common::SeekableReadStream *OSystem_IPHONE::createConfigReadStream() { +Common::String OSystem_IPHONE::getDefaultConfigFileName() { #ifdef IPHONE_OFFICIAL - char buf[256]; - strncpy(buf, iPhone_getDocumentsDir(), 256); - strncat(buf, "/Preferences", 256 - strlen(buf) ); - Common::FSNode file(buf); + Common::String path = iPhone_getDocumentsDir(); + path += "/Preferences"; + return path; #else - Common::FSNode file(SCUMMVM_PREFS_PATH); + return SCUMMVM_PREFS_PATH; #endif - return file.createReadStream(); } -Common::WriteStream *OSystem_IPHONE::createConfigWriteStream() { -#ifdef IPHONE_OFFICIAL - char buf[256]; - strncpy(buf, iPhone_getDocumentsDir(), 256); - strncat(buf, "/Preferences", 256 - strlen(buf) ); - Common::FSNode file(buf); -#else - Common::FSNode file(SCUMMVM_PREFS_PATH); -#endif - return file.createWriteStream(); -} void OSystem_IPHONE::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { // Get URL of the Resource directory of the .app bundle diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index 1ff87967a1..14325f8090 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -49,7 +49,7 @@ typedef struct AQCallbackStruct { AudioStreamBasicDescription dataFormat; } AQCallbackStruct; -class OSystem_IPHONE : public BaseBackend, public PaletteManager { +class OSystem_IPHONE : public EventsBaseBackend, public PaletteManager { protected: static const OSystem::GraphicsMode s_supportedGraphicsModes[]; @@ -57,9 +57,7 @@ protected: static SoundProc s_soundCallback; static void *s_soundParam; - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - Common::TimerManager *_timer; Graphics::Surface _framebuffer; byte *_offscreen; @@ -110,7 +108,6 @@ protected: bool _fullScreenIsDirty; bool _fullScreenOverlayIsDirty; int _screenChangeCount; - FilesystemFactory *_fsFactory; public: @@ -173,19 +170,15 @@ public: virtual int getScreenChangeID() const { return _screenChangeCount; } virtual void quit(); - FilesystemFactory *getFilesystemFactory() { return _fsFactory; } virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); virtual void getTimeAndDate(TimeDate &t) const; - virtual Common::SaveFileManager *getSavefileManager(); virtual Audio::Mixer *getMixer(); - virtual Common::TimerManager *getTimerManager(); void startSoundsystem(); void stopSoundsystem(); - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); + virtual Common::String getDefaultConfigFileName(); protected: void internUpdateScreen(); diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp index 263cbd2bcc..fa425b108a 100644 --- a/backends/platform/iphone/osys_video.cpp +++ b/backends/platform/iphone/osys_video.cpp @@ -349,6 +349,7 @@ void OSystem_IPHONE::showOverlay() { //printf("showOverlay()\n"); _overlayVisible = true; dirtyFullOverlayScreen(); + updateScreen(); iPhone_enableOverlay(true); } @@ -368,7 +369,7 @@ void OSystem_IPHONE::clearOverlay() { void OSystem_IPHONE::grabOverlay(OverlayColor *buf, int pitch) { //printf("grabOverlay()\n"); - int h = _screenHeight; + int h = _overlayHeight; OverlayColor *src = _overlayBuffer; do { diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index 8c0b34ce32..dfa8f58cce 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -27,8 +27,6 @@ #include "common/config-manager.h" #include "backends/base-backend.h" -#include "backends/saves/default/default-saves.h" -#include "backends/timer/default/default-timer.h" #include "base/main.h" @@ -73,12 +71,9 @@ enum GraphicModeID { OVERS_MPAL_340X240 }; -class OSystem_N64 : public BaseBackend, public PaletteManager { +class OSystem_N64 : public EventsBaseBackend, public PaletteManager { protected: - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - Common::TimerManager *_timer; - FilesystemFactory *_fsFactory; struct display_context * _dc; // Display context for N64 on screen buffer switching @@ -189,7 +184,6 @@ public: virtual void warpMouse(int x, int y); virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format); virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool disable); virtual bool pollEvent(Common::Event &event); virtual uint32 getMillis(); @@ -202,12 +196,9 @@ public: virtual void quit(); - virtual Common::SaveFileManager *getSavefileManager(); virtual Audio::Mixer *getMixer(); virtual void getTimeAndDate(TimeDate &t) const; - virtual Common::TimerManager *getTimerManager(); virtual void setTimerCallback(TimerProc callback, int interval); - FilesystemFactory *getFilesystemFactory(); void rebuildOffscreenGameBuffer(void); void rebuildOffscreenMouseBuffer(void); diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index 094bb839d3..69e8da3526 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -30,6 +30,8 @@ #include "pakfs_save_manager.h" #include "framfs_save_manager.h" #include "backends/fs/n64/n64-fs-factory.h" +#include "backends/saves/default/default-saves.h" +#include "backends/timer/default/default-timer.h" typedef unsigned long long uint64; @@ -137,9 +139,7 @@ OSystem_N64::OSystem_N64() { _mouseMaxX = _overlayWidth; _mouseMaxY = _overlayHeight; - _savefile = 0; _mixer = 0; - _timer = 0; _dirtyOffscreen = false; @@ -154,10 +154,7 @@ OSystem_N64::OSystem_N64() { } OSystem_N64::~OSystem_N64() { - delete _savefile; delete _mixer; - delete _timer; - delete _fsFactory; } void OSystem_N64::initBackend() { @@ -170,7 +167,7 @@ void OSystem_N64::initBackend() { if (FRAM_Detect()) { // Use FlashRAM initFramFS(); - _savefile = new FRAMSaveManager(); + _savefileManager = new FRAMSaveManager(); } else { // Use PakFS // Init Controller Pak initPakFs(); @@ -185,28 +182,36 @@ void OSystem_N64::initBackend() { } } - _savefile = new PAKSaveManager(); + _savefileManager = new PAKSaveManager(); } - _timer = new DefaultTimerManager(); + _timerManager = new DefaultTimerManager(); setTimerCallback(&timer_handler, 10); setupMixer(); - OSystem::initBackend(); - + EventsBaseBackend::initBackend(); } bool OSystem_N64::hasFeature(Feature f) { - return (f == kFeatureCursorHasPalette); + return (f == kFeatureCursorPalette); } void OSystem_N64::setFeatureState(Feature f, bool enable) { - return; + if (f == kFeatureCursorPalette) { + _cursorPaletteDisabled = !enable; + + // Rebuild cursor hicolor buffer + rebuildOffscreenMouseBuffer(); + + _dirtyOffscreen = true; + } } bool OSystem_N64::getFeatureState(Feature f) { + if (f == kFeatureCursorPalette) + return !_cursorPaletteDisabled; return false; } @@ -437,15 +442,6 @@ void OSystem_N64::setCursorPalette(const byte *colors, uint start, uint num) { _dirtyOffscreen = true; } -void OSystem_N64::disableCursorPalette(bool disable) { - _cursorPaletteDisabled = disable; - - // Rebuild cursor hicolor buffer - rebuildOffscreenMouseBuffer(); - - _dirtyOffscreen = true; -} - void OSystem_N64::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) { //Clip the coordinates if (x < 0) { @@ -852,21 +848,11 @@ void OSystem_N64::quit() { return; } -Common::SaveFileManager *OSystem_N64::getSavefileManager() { - assert(_savefile); - return _savefile; -} - Audio::Mixer *OSystem_N64::getMixer() { assert(_mixer); return _mixer; } -Common::TimerManager *OSystem_N64::getTimerManager() { - assert(_timer); - return _timer; -} - void OSystem_N64::getTimeAndDate(TimeDate &t) const { // No RTC inside the N64, read mips timer to simulate // passing of time, not a perfect solution, but can't think @@ -884,10 +870,6 @@ void OSystem_N64::getTimeAndDate(TimeDate &t) const { return; } -FilesystemFactory *OSystem_N64::getFilesystemFactory() { - return _fsFactory; -} - void OSystem_N64::setTimerCallback(TimerProc callback, int interval) { assert (interval > 0); diff --git a/backends/platform/n64/osys_n64_utilities.cpp b/backends/platform/n64/osys_n64_utilities.cpp index 8d9f0471d3..0622e6423d 100644 --- a/backends/platform/n64/osys_n64_utilities.cpp +++ b/backends/platform/n64/osys_n64_utilities.cpp @@ -21,6 +21,7 @@ */ #include "osys_n64.h" +#include "backends/timer/default/default-timer.h" void checkTimers(void) { OSystem_N64 *osys = (OSystem_N64 *)g_system; diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index b9e901bb5a..106cde1699 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -52,9 +52,6 @@ public: virtual uint32 getMillis(); virtual void delayMillis(uint msecs); virtual void getTimeAndDate(TimeDate &t) const {} - - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); }; OSystem_NULL::OSystem_NULL() { @@ -73,12 +70,11 @@ OSystem_NULL::~OSystem_NULL() { } void OSystem_NULL::initBackend() { - _mutexManager = (MutexManager *)new NullMutexManager(); + _mutexManager = new NullMutexManager(); _timerManager = new DefaultTimerManager(); _eventManager = new DefaultEventManager(this); _savefileManager = new DefaultSaveFileManager(); - _graphicsManager = (GraphicsManager *)new NullGraphicsManager(); - _audiocdManager = (AudioCDManager *)new DefaultAudioCDManager(); + _graphicsManager = new NullGraphicsManager(); _mixer = new Audio::MixerImpl(this, 22050); ((Audio::MixerImpl *)_mixer)->setReady(false); @@ -87,7 +83,7 @@ void OSystem_NULL::initBackend() { // this way; they need to be hooked into the system somehow to // be functional. Of course, can't do that in a NULL backend :). - OSystem::initBackend(); + ModularBackend::initBackend(); } bool OSystem_NULL::pollEvent(Common::Event &event) { @@ -101,18 +97,6 @@ uint32 OSystem_NULL::getMillis() { void OSystem_NULL::delayMillis(uint msecs) { } -#define DEFAULT_CONFIG_FILE "scummvm.ini" - -Common::SeekableReadStream *OSystem_NULL::createConfigReadStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); - return file.createReadStream(); -} - -Common::WriteStream *OSystem_NULL::createConfigWriteStream() { - Common::FSNode file(DEFAULT_CONFIG_FILE); - return file.createWriteStream(); -} - OSystem *OSystem_NULL_create() { return new OSystem_NULL(); } diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp index 4c29636e40..5231e9790d 100644 --- a/backends/platform/openpandora/op-backend.cpp +++ b/backends/platform/openpandora/op-backend.cpp @@ -20,13 +20,16 @@ * */ +#if defined(OPENPANDORA) + // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "backends/platform/openpandora/op-sdl.h" -#include "base/main.h" +#include "backends/platform/sdl/sdl-sys.h" #include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" +#include "backends/platform/openpandora/op-sdl.h" +#include "backends/plugins/posix/posix-provider.h" #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" @@ -35,6 +38,7 @@ #include "common/debug.h" #include "common/events.h" #include "common/file.h" +#include "common/textconsole.h" #include "common/util.h" #include "audio/mixer_intern.h" @@ -52,15 +56,29 @@ static SDL_Cursor *hiddenCursor; -static Uint32 timer_handler(Uint32 interval, void *param) { - ((DefaultTimerManager *)param)->handler(); - return interval; +OSystem_OP::OSystem_OP() + : + OSystem_POSIX() { } +//static Uint32 timer_handler(Uint32 interval, void *param) { +// ((DefaultTimerManager *)param)->handler(); +// return interval; +//} + void OSystem_OP::initBackend() { assert(!_inited); + // Create the events manager + if (_eventSource == 0) + _eventSource = new OPEventSource(); + + // Create the graphics manager + if (_graphicsManager == 0) { + _graphicsManager = new OPGraphicsManager(_eventSource); + } + // int joystick_num = ConfMan.getInt("joystick_num"); // uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; // @@ -76,12 +94,12 @@ void OSystem_OP::initBackend() { // // Create the mixer manager - if (_mixer == 0) { - _mixerManager = new DoubleBufferSDLMixerManager(); +// if (_mixer == 0) { +// _mixerManager = new DoubleBufferSDLMixerManager(); // Setup and start mixer - _mixerManager->init(); - } +// _mixerManager->init(); +// } /* Setup default save path to be workingdir/saves */ @@ -103,7 +121,7 @@ void OSystem_OP::initBackend() { if (mkdir(savePath, 0755) != 0) warning("mkdir for '%s' failed!", savePath); -// _savefileManager = new DefaultSaveFileManager(savePath); + _savefileManager = new DefaultSaveFileManager(savePath); #ifdef DUMP_STDOUT // The OpenPandora has a serial console on the EXT connection but most users do not use this so we @@ -161,24 +179,14 @@ void OSystem_OP::initBackend() { /* Make sure SDL knows that we have a joystick we want to use. */ ConfMan.setInt("joystick_num", 0); - // Create the events manager - if (_eventSource == 0) - _eventSource = new OPEventSource(); - - // Create the graphics manager - if (_graphicsManager == 0) - _graphicsManager = new OPGraphicsManager(_eventSource); - // _graphicsMutex = createMutex(); - // Invoke parent implementation of this method + /* Pass to POSIX method to do the heavy lifting */ OSystem_POSIX::initBackend(); _inited = true; } - - // enable joystick // if (joystick_num > -1 && SDL_NumJoysticks() > 0) { // printf("Using joystick: %s\n", SDL_JoystickName(0)); @@ -239,13 +247,14 @@ void OSystem_OP::initSDL() { // _videoMode.fullscreen = true; _initedSDL = true; + +// OSystem_POSIX::initSDL(); } } void OSystem_OP::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { /* Setup default extra data paths for engine data files and plugins */ - char workDirName[PATH_MAX+1]; if (getcwd(workDirName, PATH_MAX) == NULL) { @@ -276,3 +285,5 @@ void OSystem_OP::quit() { OSystem_POSIX::quit(); } + +#endif diff --git a/backends/platform/openpandora/op-main.cpp b/backends/platform/openpandora/op-main.cpp index ab777fec8f..bb359e7204 100644 --- a/backends/platform/openpandora/op-main.cpp +++ b/backends/platform/openpandora/op-main.cpp @@ -20,10 +20,8 @@ * */ - -#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/openpandora/op-sdl.h" -#include "backends/plugins/posix/posix-provider.h" +#include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" #if defined(OPENPANDORA) @@ -35,10 +33,10 @@ int main(int argc, char *argv[]) { assert(g_system); // Pre initialize the backend - //((OSystem_OP *)g_system)->init(); + ((OSystem_OP *)g_system)->init(); #ifdef DYNAMIC_MODULES - PluginManager::instance().addPluginProvider(new POSIXPluginProvider()); + PluginManager::instance().addPluginProvider(new SDLPluginProvider()); #endif // Invoke the actual ScummVM main entry point: diff --git a/backends/platform/openpandora/op-sdl.h b/backends/platform/openpandora/op-sdl.h index 9d92472b17..d493c3957c 100644 --- a/backends/platform/openpandora/op-sdl.h +++ b/backends/platform/openpandora/op-sdl.h @@ -26,12 +26,12 @@ #if defined(OPENPANDORA) #include "backends/base-backend.h" -#include "backends/platform/sdl/sdl.h" +#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/sdl/posix/posix.h" #include "backends/events/openpandora/op-events.h" #include "backends/graphics/openpandora/op-graphics.h" -#define __OPENPANDORA__ +//#define MIXER_DOUBLE_BUFFERING 1 #ifndef PATH_MAX #define PATH_MAX 255 @@ -39,16 +39,22 @@ class OSystem_OP : public OSystem_POSIX { public: - OSystem_OP() {} + OSystem_OP(); /* Platform Setup Stuff */ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority); void initBackend(); - void initSDL(); void quit(); protected: - + bool _inited; + bool _initedSDL; + + /** + * Initialse the SDL library + * with an OpenPandora workaround. + */ + virtual void initSDL(); }; #endif #endif //OP_SDL_H diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp index 038cccd9dd..ef01f3a693 100644 --- a/backends/platform/ps2/fileio.cpp +++ b/backends/platform/ps2/fileio.cpp @@ -535,23 +535,3 @@ size_t ps2_fwrite(const void *buf, size_t r, size_t n, FILE *stream) { assert(r != 0); return ((Ps2File*)stream)->write(buf, r * n) / r; } - -int ps2_fputs(const char *s, FILE *stream) { - int len = strlen(s); - - if (stream == stderr || stream == stdout) { - printf("%s", s); - sioprintf("%s", s); - return len; - } - - if (ps2_fwrite(s, 1, len, stream) == (size_t)len) - return len; - else - return EOF; -} - -int ps2_fflush(FILE *stream) { - // printf("fflush not implemented\n"); - return 0; -} diff --git a/backends/platform/ps2/fileio.h b/backends/platform/ps2/fileio.h index 3fdee5f1dc..afa2ca1f24 100644 --- a/backends/platform/ps2/fileio.h +++ b/backends/platform/ps2/fileio.h @@ -115,10 +115,8 @@ public: // TODO: Get rid of the following, instead use PS2FileStream directly. FILE *ps2_fopen(const char *fname, const char *mode); int ps2_fclose(FILE *stream); -int ps2_fflush(FILE *stream); size_t ps2_fread(void *buf, size_t r, size_t n, FILE *stream); size_t ps2_fwrite(const void *buf, size_t r, size_t n, FILE *stream); -int ps2_fputs(const char *s, FILE *stream); #endif // __PS2FILE_IO__ diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 210454c9aa..d3acd06089 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -33,36 +33,41 @@ #include <assert.h> #include <iopcontrol.h> #include <iopheap.h> -#include "common/scummsys.h" -#include "engines/engine.h" -#include "backends/platform/ps2/systemps2.h" -#include "backends/platform/ps2/Gs2dScreen.h" -#include "backends/platform/ps2/ps2input.h" -#include "backends/platform/ps2/irxboot.h" + #include <sjpcm.h> #include <libhdd.h> -#include "backends/platform/ps2/savefilemgr.h" -#include "common/file.h" -#include "backends/platform/ps2/sysdefs.h" -#include "backends/platform/ps2/fileio.h" #include <libmc.h> #include <libpad.h> -#include "backends/platform/ps2/cd.h" #include <fileXio_rpc.h> -#include "backends/platform/ps2/asyncfio.h" #include "eecodyvdfs.h" -#include "graphics/surface.h" -#include "graphics/font.h" -#include "backends/timer/default/default-timer.h" -#include "audio/mixer_intern.h" + +#include "common/config-manager.h" #include "common/events.h" +#include "common/file.h" +#include "common/scummsys.h" + +#include "backends/platform/ps2/asyncfio.h" +#include "backends/platform/ps2/cd.h" +#include "backends/platform/ps2/fileio.h" +#include "backends/platform/ps2/Gs2dScreen.h" +#include "backends/platform/ps2/irxboot.h" #include "backends/platform/ps2/ps2debug.h" -#include "backends/fs/ps2/ps2-fs-factory.h" +#include "backends/platform/ps2/ps2input.h" +#include "backends/platform/ps2/savefilemgr.h" +#include "backends/platform/ps2/sysdefs.h" +#include "backends/platform/ps2/systemps2.h" +#include "backends/fs/ps2/ps2-fs-factory.h" #include "backends/plugins/ps2/ps2-provider.h" -#include "backends/saves/default/default-saves.h" -#include "common/config-manager.h" +#include "backends/timer/default/default-timer.h" + +#include "audio/mixer_intern.h" + +#include "engines/engine.h" + +#include "graphics/font.h" +#include "graphics/surface.h" #include "icon.h" #include "ps2temp.h" @@ -342,13 +347,14 @@ OSystem_PS2::OSystem_PS2(const char *elfPath) { void OSystem_PS2::init(void) { sioprintf("Timer...\n"); - _scummTimerManager = new DefaultTimerManager(); + _timerManager = new DefaultTimerManager(); _scummMixer = new Audio::MixerImpl(this, 48000); _scummMixer->setReady(true); + initTimer(); sioprintf("Starting SavefileManager\n"); - _saveManager = new Ps2SaveFileManager(this, _screen); + _savefileManager = new Ps2SaveFileManager(this, _screen); sioprintf("Initializing ps2Input\n"); _input = new Ps2Input(this, _useMouse, _useKbd); @@ -423,7 +429,7 @@ void OSystem_PS2::initTimer(void) { void OSystem_PS2::timerThreadCallback(void) { while (!_systemQuit) { WaitSema(g_TimerThreadSema); - _scummTimerManager->handler(); + ((DefaultTimerManager *)_timerManager)->handler(); } ExitThread(); } @@ -593,22 +599,10 @@ void OSystem_PS2::delayMillis(uint msecs) { } } -Common::TimerManager *OSystem_PS2::getTimerManager() { - return _scummTimerManager; -} -/* -Common::EventManager *OSystem_PS2::getEventManager() { - return getEventManager(); -} -*/ Audio::Mixer *OSystem_PS2::getMixer() { return _scummMixer; } -Common::SaveFileManager *OSystem_PS2::getSavefileManager(void) { - return _saveManager; -} - FilesystemFactory *OSystem_PS2::getFilesystemFactory() { return &Ps2FilesystemFactory::instance(); } @@ -767,7 +761,7 @@ void OSystem_PS2::msgPrintf(int millis, const char *format, ...) { void OSystem_PS2::powerOffCallback(void) { sioprintf("powerOffCallback\n"); - // _saveManager->quit(); // romeo + // _savefileManager->quit(); // romeo if (_useHdd) { sioprintf("umount\n"); fio.umount("pfs0:"); @@ -807,7 +801,7 @@ void OSystem_PS2::quit(void) { DisableIntc(INT_TIMER0); RemoveIntcHandler(INT_TIMER0, _intrId); - // _saveManager->quit(); // romeo + // _savefileManager->quit(); // romeo _screen->quit(); padEnd(); // stop pad library @@ -976,12 +970,11 @@ void OSystem_PS2::makeConfigPath() { _configFile = strdup(path); } -Common::SeekableReadStream *OSystem_PS2::createConfigReadStream() { - Common::FSNode file(_configFile); - return file.createReadStream(); +Common::String OSystem_PS2::getDefaultConfigFileName() { + return _configFile; } -Common::WriteStream *OSystem_PS2::createConfigWriteStream() { - Common::FSNode file(_configFile); - return file.createWriteStream(); +void OSystem_PS2::logMessage(LogMessageType::Type type, const char *message) { + printf("%s", message); + sioprintf("%s", message); } diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index b21a56c184..35ceaf829e 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -27,12 +27,8 @@ #include "backends/base-backend.h" #include "graphics/palette.h" -class DefaultTimerManager; -class DefaultSaveFileManager; - class Gs2dScreen; class Ps2Input; -class Ps2SaveFileManager; // class Ps2FilesystemFactory; struct IrxReference; @@ -44,15 +40,11 @@ struct Ps2Mutex { int count; }; -namespace Common { -class TimerManager; -}; - namespace Audio { class MixerImpl; }; -class OSystem_PS2 : public BaseBackend, public PaletteManager { +class OSystem_PS2 : public EventsBaseBackend, public PaletteManager { public: OSystem_PS2(const char *elfPath); virtual ~OSystem_PS2(void); @@ -93,8 +85,6 @@ public: virtual uint32 getMillis(); virtual void delayMillis(uint msecs); - virtual Common::TimerManager *getTimerManager(); -// virtual Common::EventManager *getEventManager(); virtual bool pollEvent(Common::Event &event); virtual Audio::Mixer *getMixer(); @@ -112,11 +102,11 @@ public: virtual void quit(); - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); + virtual Common::String getDefaultConfigFileName(); + + virtual void logMessage(LogMessageType::Type type, const char *message); virtual Graphics::PixelFormat getOverlayFormat() const; - virtual Common::SaveFileManager *getSavefileManager(); virtual FilesystemFactory *getFilesystemFactory(); virtual void getTimeAndDate(TimeDate &t) const; @@ -144,15 +134,11 @@ private: void initTimer(void); void readRtcTime(void); - DefaultTimerManager *_scummTimerManager; Audio::MixerImpl *_scummMixer; bool _mouseVisible; bool _useMouse, _useKbd, _useHdd, _usbMassLoaded, _useNet; - Ps2SaveFileManager *_saveManager; - // DefaultSaveFileManager *_saveManager; - Gs2dScreen *_screen; Ps2Input *_input; uint16 _oldMouseX, _oldMouseY; diff --git a/backends/platform/psp/cursor.h b/backends/platform/psp/cursor.h index 9c24d001fb..f79968243b 100644 --- a/backends/platform/psp/cursor.h +++ b/backends/platform/psp/cursor.h @@ -53,6 +53,7 @@ public: Buffer &buffer() { return _buffer; } void setCursorPalette(const byte *colors, uint start, uint num); void enableCursorPalette(bool enable); + bool isCursorPaletteEnabled() const { return _useCursorPalette; } void setLimits(uint32 width, uint32 height); void setXY(int x, int y); int32 getX() const { return _x; } diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 3db743eff3..01124b420e 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -89,9 +89,9 @@ void OSystem_PSP::initBackend() { _imageViewer.setInputHandler(&_inputHandler); _imageViewer.setDisplayManager(&_displayManager); - _savefile = new PSPSaveFileManager; + _savefileManager = new PSPSaveFileManager; - _timer = new DefaultTimerManager(); + _timerManager = new DefaultTimerManager(); PSP_DEBUG_PRINT("calling keyboard.load()\n"); _keyboard.load(); // Load virtual keyboard files into memory @@ -100,7 +100,7 @@ void OSystem_PSP::initBackend() { setupMixer(); - OSystem::initBackend(); + EventsBaseBackend::initBackend(); } // Let's us know an engine @@ -110,13 +110,20 @@ void OSystem_PSP::engineDone() { } bool OSystem_PSP::hasFeature(Feature f) { - return (f == kFeatureOverlaySupportsAlpha || f == kFeatureCursorHasPalette); + return (f == kFeatureOverlaySupportsAlpha || f == kFeatureCursorPalette); } void OSystem_PSP::setFeatureState(Feature f, bool enable) { + if (f == kFeatureCursorPalette) { + _pendingUpdate = false; + _cursor.enableCursorPalette(enable); + } } bool OSystem_PSP::getFeatureState(Feature f) { + if (f == kFeatureCursorPalette) { + return _cursor.isCursorPaletteEnabled(); + } return false; } @@ -198,12 +205,6 @@ void OSystem_PSP::setCursorPalette(const byte *colors, uint start, uint num) { _cursor.clearKeyColor(); // Do we need this? } -void OSystem_PSP::disableCursorPalette(bool disable) { - DEBUG_ENTER_FUNC(); - _pendingUpdate = false; - _cursor.enableCursorPalette(!disable); -} - void OSystem_PSP::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) { DEBUG_ENTER_FUNC(); _displayManager.waitUntilRenderFinished(); @@ -421,7 +422,7 @@ void OSystem_PSP::quit() { } void OSystem_PSP::logMessage(LogMessageType::Type type, const char *message) { - BaseBackend::logMessage(type, message); + EventsBaseBackend::logMessage(type, message); if (type == LogMessageType::kError) PspDebugTrace(false, "%s", message); // write to file @@ -438,14 +439,6 @@ void OSystem_PSP::getTimeAndDate(TimeDate &td) const { td.tm_year = t.tm_year; } -#define PSP_CONFIG_FILE "ms0:/scummvm.ini" - -Common::SeekableReadStream *OSystem_PSP::createConfigReadStream() { - Common::FSNode file(PSP_CONFIG_FILE); - return file.createReadStream(); -} - -Common::WriteStream *OSystem_PSP::createConfigWriteStream() { - Common::FSNode file(PSP_CONFIG_FILE); - return file.createWriteStream(); +Common::String OSystem_PSP::getDefaultConfigFileName() { + return "ms0:/scummvm.ini"; } diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 00eec3da90..e6b445e232 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -42,12 +42,10 @@ #include "backends/timer/psp/timer.h" #include "backends/platform/psp/thread.h" -class OSystem_PSP : public BaseBackend, public PaletteManager { +class OSystem_PSP : public EventsBaseBackend, public PaletteManager { private: - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - Common::TimerManager *_timer; bool _pendingUpdate; // save an update we couldn't perform uint32 _pendingUpdateCounter; // prevent checking for pending update too often, in a cheap way @@ -63,7 +61,7 @@ private: ImageViewer _imageViewer; public: - OSystem_PSP() : _savefile(0), _mixer(0), _timer(0), _pendingUpdate(false), _pendingUpdateCounter(0) {} + OSystem_PSP() : _mixer(0), _pendingUpdate(false), _pendingUpdateCounter(0) {} ~OSystem_PSP(); static OSystem *instance(); @@ -99,7 +97,6 @@ protected: void grabPalette(byte *colors, uint start, uint num); public: void setCursorPalette(const byte *colors, uint start, uint num); - void disableCursorPalette(bool disable); // Screen related void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h); @@ -134,7 +131,6 @@ public: // Timer typedef int (*TimerProc)(int interval); void setTimerCallback(TimerProc callback, int interval); - Common::TimerManager *getTimerManager() { return _timer; } // Mutex MutexRef createMutex(void); @@ -148,7 +144,6 @@ public: Audio::Mixer *getMixer() { return _mixer; } // Misc - Common::SaveFileManager *getSavefileManager() { return _savefile; } FilesystemFactory *getFilesystemFactory() { return &PSPFilesystemFactory::instance(); } void getTimeAndDate(TimeDate &t) const; virtual void engineDone(); @@ -157,9 +152,7 @@ public: void logMessage(LogMessageType::Type type, const char *message); - Common::SeekableReadStream *createConfigReadStream(); - Common::WriteStream *createConfigWriteStream(); - + virtual Common::String getDefaultConfigFileName(); }; #endif /* OSYS_PSP_H */ diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index 0ef16d9a6e..9b11eb2c09 100644 --- a/backends/platform/sdl/macosx/macosx.cpp +++ b/backends/platform/sdl/macosx/macosx.cpp @@ -33,7 +33,9 @@ #include "common/archive.h" #include "common/fs.h" -#include "CoreFoundation/CoreFoundation.h" +#include "ApplicationServices/ApplicationServices.h" // for LSOpenFSRef +#include "CoreFoundation/CoreFoundation.h" // for CF* stuff +#include "CoreServices/CoreServices.h" // for FSPathMakeRef OSystem_MacOSX::OSystem_MacOSX() : @@ -75,4 +77,27 @@ void OSystem_MacOSX::setupIcon() { // Don't set icon on OS X, as we use a nicer external icon there. } +bool OSystem_MacOSX::hasFeature(Feature f) { + if (f == kFeatureDisplayLogFile) + return true; + return OSystem_POSIX::hasFeature(f); +} + +bool OSystem_MacOSX::displayLogFile() { + // Use LaunchServices to open the log file, if possible. + + if (_logFilePath.empty()) + return false; + + FSRef ref; + OSStatus err; + + err = FSPathMakeRef((const UInt8 *)_logFilePath.c_str(), &ref, NULL); + if (err == noErr) { + err = LSOpenFSRef(&ref, NULL); + } + + return err != noErr; +} + #endif diff --git a/backends/platform/sdl/macosx/macosx.h b/backends/platform/sdl/macosx/macosx.h index 6d78427522..86c70297ec 100644 --- a/backends/platform/sdl/macosx/macosx.h +++ b/backends/platform/sdl/macosx/macosx.h @@ -29,6 +29,10 @@ class OSystem_MacOSX : public OSystem_POSIX { public: OSystem_MacOSX(); + virtual bool hasFeature(Feature f); + + virtual bool displayLogFile(); + virtual void initBackend(); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); virtual void setupIcon(); diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp index 21ad7b9e35..d757186134 100644 --- a/backends/platform/sdl/posix/posix.cpp +++ b/backends/platform/sdl/posix/posix.cpp @@ -22,6 +22,8 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_getenv #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir +#define FORBIDDEN_SYMBOL_EXCEPTION_exit +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_time_h //On IRIX, sys/stat.h includes sys/time.h #include "common/scummsys.h" @@ -34,6 +36,8 @@ #include <errno.h> #include <sys/stat.h> +#include <sys/wait.h> +#include <unistd.h> OSystem_POSIX::OSystem_POSIX(Common::String baseConfigName) @@ -58,6 +62,12 @@ void OSystem_POSIX::initBackend() { OSystem_SDL::initBackend(); } +bool OSystem_POSIX::hasFeature(Feature f) { + if (f == kFeatureDisplayLogFile) + return true; + return OSystem_SDL::hasFeature(f); +} + Common::String OSystem_POSIX::getDefaultConfigFileName() { char configFile[MAXPATHLEN]; @@ -73,6 +83,10 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() { } Common::WriteStream *OSystem_POSIX::createLogFile() { + // Start out by resetting _logFilePath, so that in case + // of a failure, we know that no log file is open. + _logFilePath.clear(); + const char *home = getenv("HOME"); if (home == NULL) return 0; @@ -128,7 +142,62 @@ Common::WriteStream *OSystem_POSIX::createLogFile() { logFile += "/scummvm.log"; Common::FSNode file(logFile); - return file.createWriteStream(); + Common::WriteStream *stream = file.createWriteStream(); + if (stream) + _logFilePath = logFile; + return stream; } +bool OSystem_POSIX::displayLogFile() { + if (_logFilePath.empty()) + return false; + + // FIXME: This may not work perfectly when in fullscreen mode. + // On my system it drops from fullscreen without ScummVM noticing, + // so the next Alt-Enter does nothing, going from windowed to windowed. + // (wjp, 20110604) + + pid_t pid = fork(); + if (pid < 0) { + // failed to fork + return false; + } else if (pid == 0) { + + // Try xdg-open first + execlp("xdg-open", "xdg-open", _logFilePath.c_str(), (char*)0); + + // If we're here, that clearly failed. + + // TODO: We may also want to try detecting the case where + // xdg-open is successfully executed but returns an error code. + + // Try xterm+less next + + execlp("xterm", "xterm", "-e", "less", _logFilePath.c_str(), (char*)0); + + // TODO: If less does not exist we could fall back to 'more'. + // However, we'll have to use 'xterm -hold' for that to prevent the + // terminal from closing immediately (for short log files) or + // unexpectedly. + + exit(127); + } + + int status; + // Wait for viewer to close. + // (But note that xdg-open may have spawned a viewer in the background.) + + // FIXME: We probably want the viewer to always open in the background. + // This may require installing a SIGCHLD handler. + pid = waitpid(pid, &status, 0); + + if (pid < 0) { + // Probably nothing sensible to do in this error situation + return false; + } + + return WIFEXITED(status) && WEXITSTATUS(status) == 0; +} + + #endif diff --git a/backends/platform/sdl/posix/posix.h b/backends/platform/sdl/posix/posix.h index 0a4f38e2c4..59909a958f 100644 --- a/backends/platform/sdl/posix/posix.h +++ b/backends/platform/sdl/posix/posix.h @@ -31,14 +31,31 @@ public: OSystem_POSIX(Common::String baseConfigName = ".scummvmrc"); virtual ~OSystem_POSIX() {} + virtual bool hasFeature(Feature f); + + virtual bool displayLogFile(); + virtual void init(); virtual void initBackend(); protected: - // Base string for creating the default path and filename - // for the configuration file + /** + * Base string for creating the default path and filename for the + * configuration file. This allows the Mac OS X subclass to override + * the config file path and name. + */ Common::String _baseConfigName; + /** + * The path of the currently open log file, if any. + * + * @note This is currently a string and not an FSNode for simplicity; + * e.g. we don't need to include fs.h here, and currently the + * only use of this value is to use it to open the log file in an + * editor; for that, we need it only as a string anyway. + */ + Common::String _logFilePath; + virtual Common::String getDefaultConfigFileName(); virtual Common::WriteStream *createLogFile(); diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index a3fb719ca4..afc6c850d9 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -20,8 +20,7 @@ * */ -#define FORBIDDEN_SYMBOL_EXCEPTION_time_h -#define FORBIDDEN_SYMBOL_EXCEPTION_exit +#define FORBIDDEN_SYMBOL_ALLOW_ALL #ifdef WIN32 #define WIN32_LEAN_AND_MEAN @@ -206,6 +205,8 @@ void OSystem_SDL::initBackend() { setupIcon(); _inited = true; + + ModularBackend::initBackend(); } void OSystem_SDL::initSDL() { @@ -244,20 +245,6 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) } -Common::String OSystem_SDL::getDefaultConfigFileName() { - return "scummvm.ini"; -} - -Common::SeekableReadStream *OSystem_SDL::createConfigReadStream() { - Common::FSNode file(getDefaultConfigFileName()); - return file.createReadStream(); -} - -Common::WriteStream *OSystem_SDL::createConfigWriteStream() { - Common::FSNode file(getDefaultConfigFileName()); - return file.createWriteStream(); -} - void OSystem_SDL::setWindowCaption(const char *caption) { Common::String cap; byte c; diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index e9e9bc5696..9c08752054 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -65,8 +65,6 @@ public: virtual void setWindowCaption(const char *caption); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); virtual uint32 getMillis(); virtual void delayMillis(uint msecs); virtual void getTimeAndDate(TimeDate &td) const; @@ -93,6 +91,8 @@ protected: */ SdlEventSource *_eventSource; + virtual Common::EventSource *getDefaultEventSource() { return _eventSource; } + /** * Initialze the SDL library. */ @@ -103,12 +103,6 @@ protected: */ virtual void setupIcon(); - /** - * Get the file path where the user configuration - * of ScummVM will be saved. - */ - virtual Common::String getDefaultConfigFileName(); - // Logging virtual Common::WriteStream *createLogFile() { return 0; } Backends::Log::Log *_logger; diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 93b76f4188..5b14be4417 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -32,6 +32,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... +#include <shellapi.h> #include "backends/platform/sdl/win32/win32.h" #include "backends/fs/windows/windows-fs-factory.h" @@ -87,6 +88,49 @@ void OSystem_Win32::init() { OSystem_SDL::init(); } + +bool OSystem_Win32::hasFeature(Feature f) { + if (f == kFeatureDisplayLogFile) + return true; + + return OSystem_SDL::hasFeature(f); +} + +bool OSystem_Win32::displayLogFile() { + if (_logFilePath.empty()) + return false; + + // Try opening the log file with the default text editor + // log files should be registered as "txtfile" by default and thus open in the default text editor + HINSTANCE shellExec = ShellExecute(NULL, NULL, _logFilePath.c_str(), NULL, NULL, SW_SHOWNORMAL); + if ((intptr_t)shellExec > 32) + return true; + + // ShellExecute with the default verb failed, try the "Open with..." dialog + PROCESS_INFORMATION processInformation; + STARTUPINFO startupInfo; + memset(&processInformation, 0, sizeof(processInformation)); + memset(&startupInfo, 0, sizeof(startupInfo)); + startupInfo.cb = sizeof(startupInfo); + + char cmdLine[MAX_PATH * 2]; // CreateProcess may change the contents of cmdLine + sprintf(cmdLine, "rundll32 shell32.dll,OpenAs_RunDLL %s", _logFilePath.c_str()); + BOOL result = CreateProcess(NULL, + cmdLine, + NULL, + NULL, + FALSE, + NORMAL_PRIORITY_CLASS, + NULL, + NULL, + &startupInfo, + &processInformation); + if (result) + return true; + + return false; +} + Common::String OSystem_Win32::getDefaultConfigFileName() { char configFile[MAXPATHLEN]; @@ -136,6 +180,10 @@ Common::String OSystem_Win32::getDefaultConfigFileName() { } Common::WriteStream *OSystem_Win32::createLogFile() { + // Start out by resetting _logFilePath, so that in case + // of a failure, we know that no log file is open. + _logFilePath.clear(); + char logFile[MAXPATHLEN]; OSVERSIONINFO win32OsVersion; @@ -163,7 +211,11 @@ Common::WriteStream *OSystem_Win32::createLogFile() { strcat(logFile, "\\scummvm.log"); Common::FSNode file(logFile); - return file.createWriteStream(); + Common::WriteStream *stream = file.createWriteStream(); + if (stream) + _logFilePath= logFile; + + return stream; } else { return 0; } diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h index 268449eeff..ef7b6af3f1 100644 --- a/backends/platform/sdl/win32/win32.h +++ b/backends/platform/sdl/win32/win32.h @@ -30,7 +30,22 @@ public: virtual void init(); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); + + virtual bool hasFeature(Feature f); + + virtual bool displayLogFile(); + protected: + /** + * The path of the currently open log file, if any. + * + * @note This is currently a string and not an FSNode for simplicity; + * e.g. we don't need to include fs.h here, and currently the + * only use of this value is to use it to open the log file in an + * editor; for that, we need it only as a string anyway. + */ + Common::String _logFilePath; + virtual Common::String getDefaultConfigFileName(); virtual Common::WriteStream *createLogFile(); }; diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp index 401b19b0e1..c6b23783b8 100644 --- a/backends/platform/wii/osystem.cpp +++ b/backends/platform/wii/osystem.cpp @@ -34,6 +34,8 @@ #include "common/config-manager.h" #include "common/textconsole.h" #include "backends/fs/wii/wii-fs-factory.h" +#include "backends/saves/default/default-saves.h" +#include "backends/timer/default/default-timer.h" #include "osystem.h" #include "options.h" @@ -96,20 +98,12 @@ OSystem_Wii::OSystem_Wii() : _padSensitivity(16), _padAcceleration(4), - _savefile(NULL), - _mixer(NULL), - _timer(NULL) { + _mixer(NULL) { } OSystem_Wii::~OSystem_Wii() { - delete _savefile; - _savefile = NULL; - delete _mixer; _mixer = NULL; - - delete _timer; - _timer = NULL; } void OSystem_Wii::initBackend() { @@ -143,14 +137,14 @@ void OSystem_Wii::initBackend() { if (!getcwd(buf, MAXPATHLEN)) strcpy(buf, "/"); - _savefile = new DefaultSaveFileManager(buf); - _timer = new DefaultTimerManager(); + _savefileManager = new DefaultSaveFileManager(buf); + _timerManager = new DefaultTimerManager(); initGfx(); initSfx(); initEvents(); - OSystem::initBackend(); + EventsBaseBackend::initBackend(); } void OSystem_Wii::quit() { @@ -175,7 +169,7 @@ void OSystem_Wii::engineDone() { bool OSystem_Wii::hasFeature(Feature f) { return (f == kFeatureFullscreenMode) || (f == kFeatureAspectRatioCorrection) || - (f == kFeatureCursorHasPalette) || + (f == kFeatureCursorPalette) || (f == kFeatureOverlaySupportsAlpha); } @@ -188,6 +182,13 @@ void OSystem_Wii::setFeatureState(Feature f, bool enable) { case kFeatureAspectRatioCorrection: _arCorrection = enable; break; + case kFeatureCursorPalette: + _cursorPaletteDisabled = !enable; + if (_texMouse.palette && !enable) { + memcpy(_texMouse.palette, _cursorPalette, 256 * 2); + _cursorPaletteDirty = true; + } + break; default: break; } @@ -199,6 +200,8 @@ bool OSystem_Wii::getFeatureState(Feature f) { return _fullscreen; case kFeatureAspectRatioCorrection: return _arCorrection; + case kFeatureCursorPalette: + return !_cursorPaletteDisabled; default: return false; } @@ -252,21 +255,11 @@ void OSystem_Wii::setWindowCaption(const char *caption) { printf("window caption: %s\n", caption); } -Common::SaveFileManager *OSystem_Wii::getSavefileManager() { - assert(_savefile); - return _savefile; -} - Audio::Mixer *OSystem_Wii::getMixer() { assert(_mixer); return _mixer; } -Common::TimerManager *OSystem_Wii::getTimerManager() { - assert(_timer); - return _timer; -} - FilesystemFactory *OSystem_Wii::getFilesystemFactory() { return &WiiFilesystemFactory::instance(); } @@ -368,7 +361,7 @@ Common::String OSystem_Wii::getSystemLanguage() const { } else { // This will only happen when new languages are added to the API. warning("WII: Unknown system language: %d", langID); - return BaseBackend::getSystemLanguage(); + return EventsBaseBackend::getSystemLanguage(); } } #endif // !GAMECUBE diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h index 0db5f92fff..6863a6840e 100644 --- a/backends/platform/wii/osystem.h +++ b/backends/platform/wii/osystem.h @@ -32,8 +32,6 @@ #include "common/rect.h" #include "common/events.h" #include "backends/base-backend.h" -#include "backends/saves/default/default-saves.h" -#include "backends/timer/default/default-timer.h" #include "graphics/colormasks.h" #include "graphics/palette.h" #include "graphics/surface.h" @@ -54,7 +52,7 @@ extern void wii_memstats(void); } #endif -class OSystem_Wii : public BaseBackend, public PaletteManager { +class OSystem_Wii : public EventsBaseBackend, public PaletteManager { private: s64 _startup_time; @@ -130,9 +128,7 @@ private: void showOptionsDialog(); protected: - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - DefaultTimerManager *_timer; public: enum { @@ -171,7 +167,6 @@ protected: virtual void grabPalette(byte *colors, uint start, uint num); public: virtual void setCursorPalette(const byte *colors, uint start, uint num); - virtual void disableCursorPalette(bool disable); virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h); virtual void updateScreen(); @@ -212,9 +207,7 @@ public: virtual void setWindowCaption(const char *caption); - virtual Common::SaveFileManager *getSavefileManager(); virtual Audio::Mixer *getMixer(); - virtual Common::TimerManager *getTimerManager(); virtual FilesystemFactory *getFilesystemFactory(); virtual void getTimeAndDate(TimeDate &t) const; diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp index 8e51bbc673..389d3823e7 100644 --- a/backends/platform/wii/osystem_events.cpp +++ b/backends/platform/wii/osystem_events.cpp @@ -35,6 +35,7 @@ #endif #include "common/config-manager.h" +#include "backends/timer/default/default-timer.h" #define TIMER_THREAD_STACKSIZE (1024 * 32) #define TIMER_THREAD_PRIO 64 diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp index b44c1270f5..859e3a1395 100644 --- a/backends/platform/wii/osystem_gfx.cpp +++ b/backends/platform/wii/osystem_gfx.cpp @@ -394,15 +394,6 @@ void OSystem_Wii::setCursorPalette(const byte *colors, uint start, uint num) { _cursorPaletteDirty = true; } -void OSystem_Wii::disableCursorPalette(bool disable) { - _cursorPaletteDisabled = disable; - - if (_texMouse.palette && disable) { - memcpy(_texMouse.palette, _cursorPalette, 256 * 2); - _cursorPaletteDirty = true; - } -} - void OSystem_Wii::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) { assert(x >= 0 && x < _gameWidth); diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp index f2c461fcf9..a4786d330d 100644 --- a/backends/platform/wince/CEActionsPocket.cpp +++ b/backends/platform/wince/CEActionsPocket.cpp @@ -233,15 +233,15 @@ CEActionsPocket::~CEActionsPocket() { bool CEActionsPocket::perform(GUI::ActionType action, bool pushed) { static bool keydialogrunning = false, quitdialog = false; + _graphicsMan = ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager()); + if (!pushed) { switch (action) { case POCKET_ACTION_RIGHTCLICK: - //_CESystem->add_right_click(false); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_right_click(false); + _graphicsMan->add_right_click(false); return true; case POCKET_ACTION_LEFTCLICK: - //_CESystem->add_left_click(false); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_left_click(false); + _graphicsMan->add_left_click(false); return true; case POCKET_ACTION_PAUSE: case POCKET_ACTION_SAVE: @@ -249,7 +249,6 @@ bool CEActionsPocket::perform(GUI::ActionType action, bool pushed) { case POCKET_ACTION_MULTI: EventsBuffer::simulateKey(&_key_action[action], false); return true; - } return false; } @@ -271,55 +270,43 @@ bool CEActionsPocket::perform(GUI::ActionType action, bool pushed) { EventsBuffer::simulateKey(&_key_action[action], true); return true; case POCKET_ACTION_KEYBOARD: - //_CESystem->swap_panel(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_panel(); + _graphicsMan->swap_panel(); return true; case POCKET_ACTION_HIDE: - //_CESystem->swap_panel_visibility(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_panel_visibility(); + _graphicsMan->swap_panel_visibility(); return true; case POCKET_ACTION_SOUND: _CESystem->swap_sound_master(); return true; case POCKET_ACTION_RIGHTCLICK: - //_CESystem->add_right_click(true); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_right_click(true); + _graphicsMan->add_right_click(true); return true; case POCKET_ACTION_CURSOR: - //_CESystem->swap_mouse_visibility(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_mouse_visibility(); + _graphicsMan->swap_mouse_visibility(); return true; case POCKET_ACTION_FREELOOK: - //_CESystem->swap_freeLook(); - ((WINCESdlEventSource *)((OSystem_SDL *)g_system)->getEventManager())->swap_freeLook(); + _graphicsMan->swap_freeLook(); return true; case POCKET_ACTION_ZOOM_UP: - //_CESystem->swap_zoom_up(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_zoom_up(); + _graphicsMan->swap_zoom_up(); return true; case POCKET_ACTION_ZOOM_DOWN: - //_CESystem->swap_zoom_down(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_zoom_down(); + _graphicsMan->swap_zoom_down(); return true; case POCKET_ACTION_LEFTCLICK: - //_CESystem->add_left_click(true); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_left_click(true); + _graphicsMan->add_left_click(true); return true; case POCKET_ACTION_UP: - //_CESystem->move_cursor_up(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_up(); + _graphicsMan->move_cursor_up(); return true; case POCKET_ACTION_DOWN: - //_CESystem->move_cursor_down(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_down(); + _graphicsMan->move_cursor_down(); return true; case POCKET_ACTION_LEFT: - //_CESystem->move_cursor_left(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_left(); + _graphicsMan->move_cursor_left(); return true; case POCKET_ACTION_RIGHT: - //_CESystem->move_cursor_right(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_right(); + _graphicsMan->move_cursor_right(); return true; case POCKET_ACTION_QUIT: if (!quitdialog) { diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h index fd97c0b1df..e1f52b6b88 100644 --- a/backends/platform/wince/CEActionsPocket.h +++ b/backends/platform/wince/CEActionsPocket.h @@ -28,6 +28,7 @@ #include "common/str.h" #include "gui/Key.h" #include "gui/Actions.h" +#include "backends/graphics/wincesdl/wincesdl-graphics.h" #define POCKET_ACTION_VERSION 5 @@ -80,6 +81,7 @@ public: ~CEActionsPocket(); private: CEActionsPocket(const Common::String &gameid); + WINCESdlGraphicsManager *_graphicsMan; bool _right_click_needed; bool _hide_toolbar_needed; bool _zoom_needed; diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp index fdd52cfc26..b12dadabb6 100644 --- a/backends/platform/wince/CEActionsSmartphone.cpp +++ b/backends/platform/wince/CEActionsSmartphone.cpp @@ -199,15 +199,15 @@ CEActionsSmartphone::~CEActionsSmartphone() { bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) { static bool keydialogrunning = false, quitdialog = false; + _graphicsMan = ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager()); + if (!pushed) { switch (action) { case SMARTPHONE_ACTION_RIGHTCLICK: - //_CESystem->add_right_click(false); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_right_click(false); + _graphicsMan->add_right_click(false); return true; case SMARTPHONE_ACTION_LEFTCLICK: - //_CESystem->add_left_click(false); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_left_click(false); + _graphicsMan->add_left_click(false); return true; case SMARTPHONE_ACTION_SAVE: case SMARTPHONE_ACTION_SKIP: @@ -234,32 +234,25 @@ bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) { EventsBuffer::simulateKey(&_key_action[action], true); return true; case SMARTPHONE_ACTION_RIGHTCLICK: - //_CESystem->add_right_click(true); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_right_click(true); + _graphicsMan->add_right_click(true); return true; case SMARTPHONE_ACTION_LEFTCLICK: - //_CESystem->add_left_click(true); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->add_left_click(true); + _graphicsMan->add_left_click(true); return true; case SMARTPHONE_ACTION_UP: - //_CESystem->move_cursor_up(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_up(); + _graphicsMan->move_cursor_up(); return true; case SMARTPHONE_ACTION_DOWN: - //_CESystem->move_cursor_down(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_down(); + _graphicsMan->move_cursor_down(); return true; case SMARTPHONE_ACTION_LEFT: - //_CESystem->move_cursor_left(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_left(); + _graphicsMan->move_cursor_left(); return true; case SMARTPHONE_ACTION_RIGHT: - //_CESystem->move_cursor_right(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->move_cursor_right(); + _graphicsMan->move_cursor_right(); return true; case SMARTPHONE_ACTION_ZONE: - //_CESystem->switch_zone(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->switch_zone(); + _graphicsMan->switch_zone(); return true; case SMARTPHONE_ACTION_BINDKEYS: if (!keydialogrunning) { @@ -271,12 +264,10 @@ bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) { } return true; case SMARTPHONE_ACTION_KEYBOARD: - //_CESystem->swap_smartphone_keyboard(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->swap_smartphone_keyboard(); + _graphicsMan->swap_smartphone_keyboard(); return true; case SMARTPHONE_ACTION_ROTATE: - //_CESystem->smartphone_rotate_display(); - ((WINCESdlGraphicsManager *)((OSystem_SDL *)g_system)->getGraphicsManager())->smartphone_rotate_display(); + _graphicsMan->smartphone_rotate_display(); return true; case SMARTPHONE_ACTION_QUIT: if (!quitdialog) { diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h index 5535ce1350..3da46d3923 100644 --- a/backends/platform/wince/CEActionsSmartphone.h +++ b/backends/platform/wince/CEActionsSmartphone.h @@ -28,6 +28,7 @@ #include "common/str.h" #include "gui/Key.h" #include "gui/Actions.h" +#include "backends/graphics/wincesdl/wincesdl-graphics.h" #define SMARTPHONE_ACTION_VERSION 5 @@ -68,6 +69,7 @@ public: ~CEActionsSmartphone(); private: CEActionsSmartphone(); + WINCESdlGraphicsManager *_graphicsMan; bool _right_click_needed; OSystem_WINCE3 *_CESystem; }; diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index a53bc41667..3ab9dc8aa4 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -379,10 +379,17 @@ void OSystem_WINCE3::initBackend() { ((WINCESdlEventSource *)_eventSource)->init((WINCESdlGraphicsManager *)_graphicsManager); + + // FIXME: This timer manager is *not accesible* from the outside. + // Instead the timer manager setup by OSystem_SDL is visible on the outside. + // Since the WinCE backend actually seems to work, my guess is that + // SDL_AddTimer works after all and the following code is redundant. + // However it may be, this must be resolved one way or another. + // Create the timer. CE SDL does not support multiple timers (SDL_AddTimer). // We work around this by using the SetTimer function, since we only use // one timer in scummvm (for the time being) - _timer = _int_timer = new DefaultTimerManager(); + _int_timer = new DefaultTimerManager(); //_timerID = NULL; // OSystem_SDL will call removetimer with this, it's ok SDL_SetTimer(10, &timer_handler_wrapper); @@ -443,14 +450,9 @@ OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(), } OSystem_WINCE3::~OSystem_WINCE3() { - delete _fsFactory; delete _mixer; } -FilesystemFactory *OSystem_WINCE3::getFilesystemFactory() { - return _fsFactory; -} - void OSystem_WINCE3::swap_sound_master() { _soundMaster = !_soundMaster; @@ -464,7 +466,7 @@ void OSystem_WINCE3::swap_sound_master() { void OSystem_WINCE3::engineInit() { check_mappings(); // called here to initialize virtual keys handling - //update_game_settings(); + ((WINCESdlGraphicsManager *)_graphicsManager)->update_game_settings(); // finalize mixer init _mixerManager->init(); } diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h index a1e46081f9..adb63eb936 100644 --- a/backends/platform/wince/wince-sdl.h +++ b/backends/platform/wince/wince-sdl.h @@ -58,7 +58,6 @@ public: void getTimeAndDate(TimeDate &t) const; virtual Common::String getDefaultConfigFileName(); - virtual FilesystemFactory *getFilesystemFactory(); void swap_sound_master(); @@ -73,8 +72,6 @@ public: protected: void initSDL(); Audio::MixerImpl *_mixer; - DefaultTimerManager *_timer; - FilesystemFactory *_fsFactory; private: void check_mappings(); diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp index e2b35132dc..5e4ce11fe4 100644 --- a/backends/vkeybd/virtual-keyboard-parser.cpp +++ b/backends/vkeybd/virtual-keyboard-parser.cpp @@ -59,8 +59,7 @@ bool VirtualKeyboardParser::closedKeyCallback(ParserNode *node) { return parserError("Initial mode of keyboard pack not defined"); } else if (node->name.equalsIgnoreCase("mode")) { if (!_layoutParsed) { - return parserError("'%s' layout missing from '%s' mode", - _mode->resolution.c_str(), _mode->name.c_str()); + return parserError("'" + _mode->resolution + "' layout missing from '" + _mode->name + "' mode"); } } return true; @@ -105,7 +104,7 @@ bool VirtualKeyboardParser::parserCallback_mode(ParserNode *node) { if (_parseMode == kParseFull) { // if full parse then add new mode to keyboard if (_keyboard->_modes.contains(name)) - return parserError("Mode '%s' has already been defined", name.c_str()); + return parserError("Mode '" + name + "' has already been defined"); VirtualKeyboard::Mode mode; mode.name = name; @@ -177,7 +176,7 @@ bool VirtualKeyboardParser::parserCallback_event(ParserNode *node) { String name = node->values["name"]; if (_mode->events.contains(name)) - return parserError("Event '%s' has already been defined", name.c_str()); + return parserError("Event '" + name + "' has already been defined"); VirtualKeyboard::VKEvent *evt = new VirtualKeyboard::VKEvent(); evt->name = name; @@ -235,7 +234,7 @@ bool VirtualKeyboardParser::parserCallback_event(ParserNode *node) { evt->type = VirtualKeyboard::kVKEventMoveRight; } else { delete evt; - return parserError("Event type '%s' not known", type.c_str()); + return parserError("Event type '" + type + "' not known"); } _mode->events[name] = evt; @@ -257,7 +256,7 @@ bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) { SeekableReadStream *file = _keyboard->_fileArchive->createReadStreamForMember(_mode->bitmapName); if (!file) - return parserError("Bitmap '%s' not found", _mode->bitmapName.c_str()); + return parserError("Bitmap '" + _mode->bitmapName + "' not found"); const Graphics::PixelFormat format = g_system->getOverlayFormat(); @@ -265,7 +264,7 @@ bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) { delete file; if (!_mode->image) - return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str()); + return parserError("Error loading bitmap '" + _mode->bitmapName + "'"); int r, g, b; if (node->values.contains("transparent_color")) { @@ -313,7 +312,7 @@ bool VirtualKeyboardParser::parserCallback_area(ParserNode *node) { Polygon *poly = _mode->imageMap.createArea(target); return parsePolygon(*poly, coords); } - return parserError("Area shape '%s' not known", shape.c_str()); + return parserError("Area shape '" + shape + "' not known"); } byte VirtualKeyboardParser::parseFlags(const String& flags) { diff --git a/common/forbidden.h b/common/forbidden.h index c551110d0e..9cba19cf5e 100644 --- a/common/forbidden.h +++ b/common/forbidden.h @@ -34,6 +34,9 @@ * Backend files may #define FORBIDDEN_SYMBOL_ALLOW_ALL if they * have to access functions like fopen, fread etc. * Regular code, esp. code in engines/, should never do that. + * To ease transition, though, we allow re-enabling selected symbols + * in frontend code. However, this should only be used as a temporary + * measure. Especially new code should avoid this at all costs. */ #ifndef FORBIDDEN_SYMBOL_ALLOW_ALL @@ -51,7 +54,7 @@ * the compiler will hopefully print along with its own error message), * we try to make clear what is causing the error. */ -#define FORBIDDEN_SYMBOL_REPLACEMENT FORBIDDEN SYMBOL !%* +#define FORBIDDEN_SYMBOL_REPLACEMENT FORBIDDEN_look_at_common_forbidden_h_for_more_info SYMBOL !%* #ifndef FORBIDDEN_SYMBOL_EXCEPTION_printf @@ -79,6 +82,21 @@ #define FILE FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stdin +#undef stdin +#define stdin FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stdout +#undef stdout +#define stdout FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stderr +#undef stderr +#define stderr FORBIDDEN_SYMBOL_REPLACEMENT +#endif + #ifndef FORBIDDEN_SYMBOL_EXCEPTION_fopen #undef fopen #define fopen(a,b) FORBIDDEN_SYMBOL_REPLACEMENT @@ -124,22 +142,41 @@ #define fputc(a,b) FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fgets +#undef fgets +#define fgets(a,b,c) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fputs +#undef fputs +#define fputs(a,b) FORBIDDEN_SYMBOL_REPLACEMENT +#endif #ifndef FORBIDDEN_SYMBOL_EXCEPTION_getc #undef getc #define getc(a) FORBIDDEN_SYMBOL_REPLACEMENT #endif -#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getchar -#undef getchar -#define getchar() FORBIDDEN_SYMBOL_REPLACEMENT -#endif - #ifndef FORBIDDEN_SYMBOL_EXCEPTION_putc #undef putc #define putc(a,b) FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_gets +#undef gets +#define gets(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_puts +#undef puts +#define puts(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getchar +#undef getchar +#define getchar() FORBIDDEN_SYMBOL_REPLACEMENT +#endif + #ifndef FORBIDDEN_SYMBOL_EXCEPTION_putchar #undef putchar #define putchar(a) FORBIDDEN_SYMBOL_REPLACEMENT diff --git a/common/macresman.cpp b/common/macresman.cpp index 70c6e0a7ce..c1cab8b96a 100644 --- a/common/macresman.cpp +++ b/common/macresman.cpp @@ -32,7 +32,6 @@ #ifdef MACOSX #include "common/config-manager.h" -#include "backends/fs/stdiostream.h" #endif namespace Common { @@ -108,14 +107,17 @@ bool MacResManager::open(String filename) { #ifdef MACOSX // Check the actual fork on a Mac computer String fullPath = ConfMan.get("path") + "/" + filename + "/..namedfork/rsrc"; - SeekableReadStream *macResForkRawStream = StdioStream::makeFromPath(fullPath, false); + FSNode resFsNode = FSNode(fullPath); + if (resFsNode.exists()) { + SeekableReadStream *macResForkRawStream = resFsNode.createReadStream();; - if (macResForkRawStream && loadFromRawFork(*macResForkRawStream)) { - _baseFileName = filename; - return true; - } + if (macResForkRawStream && loadFromRawFork(*macResForkRawStream)) { + _baseFileName = filename; + return true; + } - delete macResForkRawStream; + delete macResForkRawStream; + } #endif File *file = new File(); @@ -168,14 +170,17 @@ bool MacResManager::open(FSNode path, String filename) { #ifdef MACOSX // Check the actual fork on a Mac computer String fullPath = path.getPath() + "/" + filename + "/..namedfork/rsrc"; - SeekableReadStream *macResForkRawStream = StdioStream::makeFromPath(fullPath, false); + FSNode resFsNode = FSNode(fullPath); + if (resFsNode.exists()) { + SeekableReadStream *macResForkRawStream = resFsNode.createReadStream();; - if (macResForkRawStream && loadFromRawFork(*macResForkRawStream)) { - _baseFileName = filename; - return true; - } + if (macResForkRawStream && loadFromRawFork(*macResForkRawStream)) { + _baseFileName = filename; + return true; + } - delete macResForkRawStream; + delete macResForkRawStream; + } #endif // First, let's try to see if the Mac converted name exists diff --git a/common/str.cpp b/common/str.cpp index 740e7b6a06..223188bdd6 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "common/str.h" #include "common/hash-str.h" -#include "common/util.h" - +#include "common/list.h" #include "common/memorypool.h" +#include "common/str.h" +#include "common/util.h" #include <stdarg.h> @@ -256,7 +256,7 @@ String &String::operator=(char c) { String &String::operator+=(const char *str) { if (_str <= str && str <= _str + _size) - return operator+=(Common::String(str)); + return operator+=(String(str)); int len = strlen(str); if (len > 0) { @@ -270,7 +270,7 @@ String &String::operator+=(const char *str) { String &String::operator+=(const String &str) { if (&str == this) - return operator+=(Common::String(str)); + return operator+=(String(str)); int len = str._size; if (len > 0) { @@ -612,7 +612,7 @@ char *trim(char *t) { return rtrim(ltrim(t)); } -Common::String lastPathComponent(const Common::String &path, const char sep) { +String lastPathComponent(const String &path, const char sep) { const char *str = path.c_str(); const char *last = str + path.size(); @@ -622,7 +622,7 @@ Common::String lastPathComponent(const Common::String &path, const char sep) { // Path consisted of only slashes -> return empty string if (last == str) - return Common::String(); + return String(); // Now scan the whole component const char *first = last - 1; @@ -632,24 +632,26 @@ Common::String lastPathComponent(const Common::String &path, const char sep) { if (*first == sep) first++; - return Common::String(first, last); + return String(first, last); } -Common::String normalizePath(const Common::String &path, const char sep) { +String normalizePath(const String &path, const char sep) { if (path.empty()) return path; const char *cur = path.c_str(); - Common::String result; + String result; // If there is a leading slash, preserve that: if (*cur == sep) { result += sep; + // Skip over multiple leading slashes, so "//" equals "/" while (*cur == sep) ++cur; } - // Scan till the end of the String + // Scan for path components till the end of the String + List<String> comps; while (*cur != 0) { const char *start = cur; @@ -657,18 +659,16 @@ Common::String normalizePath(const Common::String &path, const char sep) { while (*cur != sep && *cur != 0) cur++; - const Common::String component(start, cur); - - // Skip empty components and dot components, add all others - if (!component.empty() && component != ".") { - // Add a separator before the component, unless the result - // string already ends with one (which happens only if the - // path *starts* with a separator). - if (!result.empty() && result.lastChar() != sep) - result += sep; + const String component(start, cur); - // Add the component - result += component; + if (component.empty() || component == ".") { + // Skip empty components and dot components + } else if (!comps.empty() && component == ".." && comps.back() != "..") { + // If stack is non-empty and top is not "..", remove top + comps.pop_back(); + } else { + // Add the component to the stack + comps.push_back(component); } // Skip over separator chars @@ -676,6 +676,14 @@ Common::String normalizePath(const Common::String &path, const char sep) { cur++; } + // Finally, assemble all components back into a path + while (!comps.empty()) { + result += comps.front(); + comps.pop_front(); + if (!comps.empty()) + result += sep; + } + return result; } @@ -749,7 +757,7 @@ String tag2string(uint32 tag) { if (!isprint((unsigned char)str[i])) str[i] = '.'; } - return Common::String(str); + return String(str); } size_t strlcpy(char *dst, const char *src, size_t size) { diff --git a/common/system.cpp b/common/system.cpp index 1f2f8cc6d5..fae7a3ef34 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -20,34 +20,71 @@ * */ -// Disable symbol overrides so that we can use system headers. -// FIXME: Necessary for the PS2 port, should get rid of this eventually. -#define FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_exit +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE +#define FORBIDDEN_SYMBOL_EXCEPTION_fputs +#define FORBIDDEN_SYMBOL_EXCEPTION_fflush +#define FORBIDDEN_SYMBOL_EXCEPTION_stdout +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr #include "common/system.h" +#include "common/events.h" +#include "common/fs.h" +#include "common/savefile.h" #include "common/str.h" +#include "common/textconsole.h" -#ifdef __PLAYSTATION2__ - // for those replaced fopen/fread/etc functions - #include "backends/platform/ps2/fileio.h" - - #define fputs(str, file) ps2_fputs(str, file) - #define fflush(a) ps2_fflush(a) -#endif - -#ifdef __DS__ - #include "backends/fs/ds/ds-fs.h" - - #define fputs(str, file) DS::std_fwrite(str, strlen(str), 1, file) - #define fflush(file) DS::std_fflush(file) -#endif +#include "backends/audiocd/default/default-audiocd.h" +#include "backends/fs/fs-factory.h" +#include "backends/timer/default/default-timer.h" OSystem *g_system = 0; OSystem::OSystem() { + _audiocdManager = 0; + _eventManager = 0; + _timerManager = 0; + _savefileManager = 0; + _fsFactory = 0; } OSystem::~OSystem() { + delete _audiocdManager; + _audiocdManager = 0; + + delete _eventManager; + _eventManager = 0; + + delete _timerManager; + _timerManager = 0; + + delete _savefileManager; + _savefileManager = 0; + + delete _fsFactory; + _fsFactory = 0; +} + +void OSystem::initBackend() { + // Verify all managers has been set + if (!_audiocdManager) + error("Backend failed to instantiate audio CD manager"); + if (!_eventManager) + error("Backend failed to instantiate event manager"); + if (!_timerManager) + error("Backend failed to instantiate timer manager"); + + // TODO: We currently don't check _savefileManager, because at least + // on the Nintendo DS, it is possible that none is set. That should + // probably be treated as "saving is not possible". Or else the NDS + // port needs to be changed to always set a _savefileManager +// if (!_savefileManager) +// error("Backend failed to instantiate savefile manager"); + + // TODO: We currently don't check _fsFactory because not all ports + // set it. +// if (!_fsFactory) +// error("Backend failed to instantiate fs factory"); } bool OSystem::setGraphicsMode(const char *name) { @@ -76,16 +113,41 @@ void OSystem::fatalError() { exit(1); } +FilesystemFactory *OSystem::getFilesystemFactory() { + assert(_fsFactory); + return _fsFactory; +} + +Common::SeekableReadStream *OSystem::createConfigReadStream() { + Common::FSNode file(getDefaultConfigFileName()); + return file.createReadStream(); +} + +Common::WriteStream *OSystem::createConfigWriteStream() { +#ifdef __DC__ + return 0; +#else + Common::FSNode file(getDefaultConfigFileName()); + return file.createWriteStream(); +#endif +} + +Common::String OSystem::getDefaultConfigFileName() { + return "scummvm.ini"; +} + void OSystem::logMessage(LogMessageType::Type type, const char *message) { +#if !defined(__PLAYSTATION2__) && !defined(__DS__) FILE *output = 0; - if (type == LogMessageType::kDebug) + if (type == LogMessageType::kInfo || type == LogMessageType::kDebug) output = stdout; else output = stderr; fputs(message, output); fflush(output); +#endif } Common::String OSystem::getSystemLanguage() const { diff --git a/common/system.h b/common/system.h index b584739b77..d26bc593aa 100644 --- a/common/system.h +++ b/common/system.h @@ -73,6 +73,7 @@ struct TimeDate { namespace LogMessageType { enum Type { + kInfo, kError, kWarning, kDebug @@ -95,6 +96,72 @@ protected: OSystem(); virtual ~OSystem(); +protected: + /** + * @name Module slots + * + * For backend authors only, the following pointers (= "slots) to various + * subsystem managers / factories / etc. can and should be set to + * a suitable instance of the respective type. + * + * For some of the slots, a default instance is set if your backend + * does not do so. For details, please look at the documentation of + * each slot. + * + * A backend may setup slot values in its initBackend() method, + * its constructor or somewhere in between. But it must a slot's value + * no later than in its initBackend() implementation, because + * OSystem::initBackend() will create any default instances if + * none has been set yet (and for other slots, will verify that + * one has been set; if not, an error may be generated). + */ + //@{ + + /** + * No default value is provided for _audiocdManager by OSystem. + * However, BaseBackend::initBackend() does set a default value + * if none has been set before. + * + * @note _audiocdManager is deleted by the OSystem destructor. + */ + AudioCDManager *_audiocdManager; + + /** + * No default value is provided for _eventManager by OSystem. + * However, BaseBackend::initBackend() does set a default value + * if none has been set before. + * + * @note _eventManager is deleted by the OSystem destructor. + */ + Common::EventManager *_eventManager; + + /** + * No default value is provided for _timerManager by OSystem. + * + * @note _timerManager is deleted by the OSystem destructor. + */ + Common::TimerManager *_timerManager; + + /** + * No default value is provided for _savefileManager by OSystem. + * + * @note _savefileManager is deleted by the OSystem destructor. + */ + Common::SaveFileManager *_savefileManager; + + /** + * No default value is provided for _fsFactory by OSystem. + * + * Note that _fsFactory is typically required very early on, + * so it usually should be set in the backends constructor or shortly + * thereafter, and before initBackend() is called. + * + * @note _fsFactory is deleted by the OSystem destructor. + */ + FilesystemFactory *_fsFactory; + + //@} + public: /** @@ -105,7 +172,7 @@ public: * parent class. They should do so near the end of their own * implementation. */ - virtual void initBackend() { } + virtual void initBackend(); /** * Allows the backend to perform engine specific init. @@ -128,11 +195,19 @@ public: * - fullscreen mode * - aspect ration correction * - a virtual keyboard for text entry (on PDAs) + * + * One has to distinguish between the *availability* of a feature, + * which can be checked using hasFeature(), and its *state*. + * For example, the SDL backend *has* the kFeatureFullscreenMode, + * so hasFeature returns true for it. On the other hand, + * fullscreen mode may be active or not; this can be determined + * by checking the state via getFeatureState(). Finally, to + * switch between fullscreen and windowed mode, use setFeatureState(). */ enum Feature { /** - * If your backend supports both a windowed and a fullscreen mode, - * then this feature flag can be used to switch between the two. + * If supported, this feature flag can be used to switch between + * windowed and fullscreen mode. */ kFeatureFullscreenMode, @@ -144,10 +219,10 @@ public: * pixels). When the backend support this, then games running at * 320x200 pixels should be scaled up to 320x240 pixels. For all other * resolutions, ignore this feature flag. - * @note You can find utility functions in common/scaler.h which can - * be used to implement aspect ratio correction. In particular, + * @note Backend implementors can find utility functions in common/scaler.h + * which can be used to implement aspect ratio correction. In * stretch200To240() can stretch a rect, including (very fast) - * interpolation, and works in-place. + * particular, interpolation, and works in-place. */ kFeatureAspectRatioCorrection, @@ -159,43 +234,58 @@ public: kFeatureVirtualKeyboard, /** - * This flag determines whether or not the cursor can have its own palette. + * Backends supporting this feature allow specifying a custom palette + * for the cursor. The custom palette is used if the feature state + * is set to true by the client code via setFeatureState(). + * * It is currently used only by some Macintosh versions of Humongous - * Entertainment games. If the backend doesn't implement this feature then - * the engine switches to b/w versions of cursors. + * Entertainment games. If the backend doesn't implement this feature + * then the engine switches to b/w versions of cursors. * The GUI also relies on this feature for mouse cursors. - * - * To enable the cursor palette call "disableCursorPalette" with false. - * @see disableCursorPalette */ - kFeatureCursorHasPalette, + kFeatureCursorPalette, /** - * Set to true if the overlay pixel format has an alpha channel. - * This should only be set if it offers at least 3-4 bits of accuracy, - * as opposed to a single alpha bit. + * A backend have this feature if its overlay pixel format has an alpha + * channel which offers at least 3-4 bits of accuracy (as opposed to + * just a single alpha bit). + * + * This feature has no associated state. */ kFeatureOverlaySupportsAlpha, /** - * Set to true to iconify the window. + * Client code can set the state of this feature to true in order to + * iconify the application window. */ kFeatureIconifyWindow, /** - * This feature, set to true, is a hint toward the backend to disable all - * key filtering/mapping, in cases where it would be beneficial to do so. - * As an example case, this is used in the agi engine's predictive dialog. + * Setting the state of this feature to true tells the backend to disable + * all key filtering/mapping, in cases where it would be beneficial to do so. + * As an example case, this is used in the AGI engine's predictive dialog. * When the dialog is displayed this feature is set so that backends with * phone-like keypad temporarily unmap all user actions which leads to * comfortable word entry. Conversely, when the dialog exits the feature * is set to false. + * + * TODO: The word 'beneficial' above is very unclear. Beneficial to + * whom and for what??? Just giving an example is not enough. + * * TODO: Fingolfin suggests that the way the feature is used can be * generalized in this sense: Have a keyboard mapping feature, which the * engine queries for to assign keys to actions ("Here's my default key * map for these actions, what do you want them set to?"). */ - kFeatureDisableKeyFiltering + kFeatureDisableKeyFiltering, + + /** + * The presence of this feature indicates whether the displayLogFile() + * call is supported. + * + * This feature has no associated state. + */ + kFeatureDisplayLogFile }; /** @@ -367,7 +457,7 @@ public: * reset the scale to x1 so the screen will not be too big when starting * the game. */ - virtual void resetGraphicsScale() = 0; + virtual void resetGraphicsScale() {} #ifdef USE_RGB_COLOR /** @@ -770,25 +860,13 @@ public: * The palette entries from 'start' till (start+num-1) will be replaced - so * a full palette update is accomplished via start=0, num=256. * - * Backends which implement it should have kFeatureCursorHasPalette flag set + * Backends which implement it should have kFeatureCursorPalette flag set * * @see setPalette - * @see kFeatureCursorHasPalette + * @see kFeatureCursorPalette */ virtual void setCursorPalette(const byte *colors, uint start, uint num) {} - /** - * Disable or enable cursor palette. - * - * Backends which implement it should have kFeatureCursorHasPalette flag set - * - * @param disable True to disable, false to enable. - * - * @see setPalette - * @see kFeatureCursorHasPalette - */ - virtual void disableCursorPalette(bool disable) {} - //@} @@ -813,13 +891,17 @@ public: * Return the timer manager singleton. For more information, refer * to the TimerManager documentation. */ - virtual Common::TimerManager *getTimerManager() = 0; + inline Common::TimerManager *getTimerManager() { + return _timerManager; + } /** * Return the event manager singleton. For more information, refer * to the EventManager documentation. */ - virtual Common::EventManager *getEventManager() = 0; + inline Common::EventManager *getEventManager() { + return _eventManager; + } /** * Register hardware keys with keymapper @@ -909,7 +991,9 @@ public: * Return the audio cd manager. For more information, refer to the * AudioCDManager documentation. */ - virtual AudioCDManager *getAudioCDManager() = 0; + inline AudioCDManager *getAudioCDManager() { + return _audiocdManager; + } //@} @@ -943,7 +1027,8 @@ public: * rectangle over the regular screen content; or in a message box beneath * it; etc.). * - * Currently, only pure ASCII messages can be expected to show correctly. + * The message is expected to be provided in the current TranslationManager + * charset. * * @note There is a default implementation in BaseBackend which uses a * TimedMessageDialog to display the message. Hence implementing @@ -958,14 +1043,16 @@ public: * and other modifiable persistent game data. For more information, * refer to the SaveFileManager documentation. */ - virtual Common::SaveFileManager *getSavefileManager() = 0; + inline Common::SaveFileManager *getSavefileManager() { + return _savefileManager; + } /** * Returns the FilesystemFactory object, depending on the current architecture. * * @return the FSNode factory for the current architecture */ - virtual FilesystemFactory *getFilesystemFactory() = 0; + virtual FilesystemFactory *getFilesystemFactory(); /** * Add system specific Common::Archive objects to the given SearchSet. @@ -984,7 +1071,7 @@ public: * ReadStream instance. It is the callers responsiblity to delete * the stream after use. */ - virtual Common::SeekableReadStream *createConfigReadStream() = 0; + virtual Common::SeekableReadStream *createConfigReadStream(); /** * Open the default config file for writing, by returning a suitable @@ -993,7 +1080,14 @@ public: * * May return 0 to indicate that writing to config file is not possible. */ - virtual Common::WriteStream *createConfigWriteStream() = 0; + virtual Common::WriteStream *createConfigWriteStream(); + + /** + * Get the default file name (or even path) where the user configuration + * of ScummVM will be saved. + * Note that not all ports may use this. + */ + virtual Common::String getDefaultConfigFileName(); /** * Logs a given message. @@ -1010,6 +1104,33 @@ public: virtual void logMessage(LogMessageType::Type type, const char *message); /** + * Open the log file in a way that allows the user to review it, + * and possibly email it (or parts of it) to the ScummVM team, + * e.g. as part of a bug report. + * + * On a desktop operating system, this would typically launch + * some kind of (external) text editor / viewer. + * On a phone, it might also cause a context switch to another + * application. Finally, on some ports, it might not be supported + * at all, and so do nothing. + * + * The kFeatureDisplayLogFile feature flag can be used to + * test whether this call has been implemented by the active + * backend. + * + * @return true if all seems to have gone fine, false if an error occurred + * + * @note An error could mean that the log file did not exist, + * or the editor could not launch. However, a return value of true does + * not guarantee that the user actually will see the log file. + * + * @note It is up to the backend to ensure that the system is in a state + * that allows the user to actually see the displayed log files. This + * might for example require leaving fullscreen mode. + */ + virtual bool displayLogFile() { return false; } + + /** * Returns the locale of the system. * * This returns the currently set up locale of the system, on which diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp index 9bd052fb3d..5217c4e82c 100644 --- a/common/xmlparser.cpp +++ b/common/xmlparser.cpp @@ -22,9 +22,7 @@ // FIXME: Avoid using fprintf #define FORBIDDEN_SYMBOL_EXCEPTION_fprintf - -// FIXME: Avoid using vfprintf -#define FORBIDDEN_SYMBOL_EXCEPTION_vfprintf +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr #include "common/xmlparser.h" @@ -83,7 +81,7 @@ void XMLParser::close() { _stream = 0; } -bool XMLParser::parserError(const char *errorString, ...) { +bool XMLParser::parserError(const Common::String &errStr) { _state = kParserError; const int startPosition = _stream->pos(); @@ -134,12 +132,7 @@ bool XMLParser::parserError(const char *errorString, ...) { fprintf(stderr, "%c", _stream->readByte()); fprintf(stderr, "\n\nParser error: "); - - va_list args; - va_start(args, errorString); - vfprintf(stderr, errorString, args); - va_end(args); - + fprintf(stderr, "%s", errStr.c_str()); fprintf(stderr, "\n\n"); return false; @@ -181,16 +174,16 @@ bool XMLParser::parseActiveKey(bool closed) { for (List<XMLKeyLayout::XMLKeyProperty>::const_iterator i = key->layout->properties.begin(); i != key->layout->properties.end(); ++i) { if (i->required && !localMap.contains(i->name)) - return parserError("Missing required property '%s' inside key '%s'", i->name.c_str(), key->name.c_str()); + return parserError("Missing required property '" + i->name + "' inside key '" + key->name + "'"); else if (localMap.contains(i->name)) keyCount--; } if (keyCount > 0) - return parserError("Unhandled property inside key '%s'.", key->name.c_str()); + return parserError("Unhandled property inside key '" + key->name + "'."); } else { - return parserError("Unexpected key in the active scope ('%s').", key->name.c_str()); + return parserError("Unexpected key in the active scope ('" + key->name + "')."); } // check if any of the parents must be ignored. @@ -205,7 +198,7 @@ bool XMLParser::parseActiveKey(bool closed) { // when keyCallback() fails, a parserError() must be set. // We set it manually in that case. if (_state != kParserError) - parserError("Unhandled exception when parsing '%s' key.", key->name.c_str()); + parserError("Unhandled exception when parsing '" + key->name + "' key."); return false; } @@ -395,7 +388,7 @@ bool XMLParser::parse() { case kParserNeedPropertyName: if (activeClosure) { if (!closeKey()) { - parserError("Missing data when closing key '%s'.", _activeKey.top()->name.c_str()); + parserError("Missing data when closing key '" + _activeKey.top()->name + "'."); break; } diff --git a/common/xmlparser.h b/common/xmlparser.h index 84fca294a0..7923e43a37 100644 --- a/common/xmlparser.h +++ b/common/xmlparser.h @@ -274,7 +274,7 @@ protected: * Parser error always returns "false" so we can pass the return value * directly and break down the parsing. */ - bool parserError(const char *errorString, ...) GCC_PRINTF(2, 3); + bool parserError(const Common::String &errStr); /** * Skips spaces/whitelines etc. diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 6a8e6a0fbe..e4686cc66c 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -45,7 +45,7 @@ #include <map> enum { - kKyraDatVersion = 73 + kKyraDatVersion = 74 }; const ExtractFilename extractFilenames[] = { diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index f65ff14e1e..76d5d70186 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -107,7 +107,7 @@ const Game lolGames[] = { // DOS CD (multi language version, with no language specific strings) { kLol, { EN_ANY, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "263998ec600afca1cc7b935c473df670" } }, - + { kLol, { IT_ITA, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "f2af366e00f79dbf832fa19701d71ed9" } }, // Italian fan translation GAME_DUMMY_ENTRY }; diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index f8ce80acfd..bdbc0a4074 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -373,6 +373,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t\t<StringPooling>true</StringPooling>\n" "\t\t\t<BufferSecurityCheck>false</BufferSecurityCheck>\n" "\t\t\t<DebugInformationFormat></DebugInformationFormat>\n" + "\t\t\t<RuntimeLibrary>MultiThreaded</RuntimeLibrary>\n" "\t\t\t<EnablePREfast>" << (enableAnalysis ? "true" : "false") << "</EnablePREfast>\n" "\t\t</ClCompile>\n" "\t\t<Link>\n" diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 4fadfd2509..b4c2b46ba4 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -269,6 +269,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea "\t\tStringPooling=\"true\"\n" "\t\tBufferSecurityCheck=\"false\"\n" "\t\tDebugInformationFormat=\"0\"\n" + "\t\tRuntimeLibrary=\"0\"\n" "\t\tAdditionalOption=\"" << (enableAnalysis ? "/analyze" : "") << "\"\n" "\t/>\n" "\t<Tool\n" diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 23e866c62e..1d79ceddfd 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj index b9b276d654..8f6ba6429d 100755 --- a/dists/iphone/scummvm.xcodeproj/project.pbxproj +++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj @@ -36,7 +36,6 @@ 8CB5A9E41253FDF500CB6BC7 /* teenagent.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */; }; 8CD1ED0B126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; }; 8CD1ED0C126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; }; - 8CD1ED0D126202AB00FA198C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC9126202AA00FA198C /* engine.cpp */; }; 8CD1ED0E126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; }; 8CD1ED0F126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; }; 8CD1ED10126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; }; @@ -68,7 +67,6 @@ 8CD1ED2E126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; }; 8CD1ED2F126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; }; 8CD1ED30126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; }; - 8CD1ED31126202AB00FA198C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC9126202AA00FA198C /* engine.cpp */; }; 8CD1ED32126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; }; 8CD1ED33126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; }; 8CD1ED34126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; }; @@ -100,7 +98,6 @@ 8CD1ED52126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; }; 8CD1ED53126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; }; 8CD1ED54126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; }; - 8CD1ED55126202AB00FA198C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC9126202AA00FA198C /* engine.cpp */; }; 8CD1ED56126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; }; 8CD1ED57126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; }; 8CD1ED58126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; }; @@ -227,7 +224,6 @@ DF093E9C0F63CB26002D821E /* consolefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */; }; DF093E9D0F63CB26002D821E /* newfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775E0D81F4E900B6D1FB /* newfont.cpp */; }; DF093E9E0F63CB26002D821E /* newfont_big.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */; }; - DF093E9F0F63CB26002D821E /* scummfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477600D81F4E900B6D1FB /* scummfont.cpp */; }; DF093EA00F63CB26002D821E /* iff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477610D81F4E900B6D1FB /* iff.cpp */; }; DF093EA10F63CB26002D821E /* imagedec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477630D81F4E900B6D1FB /* imagedec.cpp */; }; DF093EA20F63CB26002D821E /* primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4776A0D81F4E900B6D1FB /* primitives.cpp */; }; @@ -238,49 +234,20 @@ DF093EA80F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; }; DF093EA90F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; }; DF093EAA0F63CB26002D821E /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; }; - DF093EAB0F63CB26002D821E /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477980D81F4E900B6D1FB /* editable.cpp */; }; - DF093EAC0F63CB26002D821E /* EditTextWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */; }; DF093EAD0F63CB26002D821E /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; }; DF093EAE0F63CB26002D821E /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; }; - DF093EAF0F63CB26002D821E /* ListWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */; }; DF093EB00F63CB26002D821E /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; }; DF093EB10F63CB26002D821E /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; }; DF093EB20F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; }; DF093EB30F63CB26002D821E /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; }; - DF093EB40F63CB26002D821E /* PopUpWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */; }; - DF093EB50F63CB26002D821E /* ScrollBarWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */; }; - DF093EB60F63CB26002D821E /* TabWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */; }; DF093EB70F63CB26002D821E /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; }; DF093EB80F63CB26002D821E /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; }; - DF093EBB0F63CB26002D821E /* audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */; }; - DF093EBC0F63CB26002D821E /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */; }; - DF093EBE0F63CB26002D821E /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D10D81F4E900B6D1FB /* fmopl.cpp */; }; - DF093EC00F63CB26002D821E /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D50D81F4E900B6D1FB /* mididrv.cpp */; }; - DF093EC10F63CB26002D821E /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D70D81F4E900B6D1FB /* midiparser.cpp */; }; - DF093EC20F63CB26002D821E /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */; }; - DF093EC30F63CB26002D821E /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */; }; - DF093EC40F63CB26002D821E /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DB0D81F4E900B6D1FB /* mixer.cpp */; }; - DF093EC50F63CB26002D821E /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */; }; - DF093EC60F63CB26002D821E /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E00D81F4E900B6D1FB /* module.cpp */; }; - DF093EC70F63CB26002D821E /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E20D81F4E900B6D1FB /* paula.cpp */; }; - DF093EC80F63CB26002D821E /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E40D81F4E900B6D1FB /* protracker.cpp */; }; - DF093EC90F63CB26002D821E /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E60D81F4E900B6D1FB /* rjp1.cpp */; }; - DF093ECA0F63CB26002D821E /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E80D81F4E900B6D1FB /* soundfx.cpp */; }; - DF093ECC0F63CB26002D821E /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */; }; - DF093ECD0F63CB26002D821E /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477EF0D81F4E900B6D1FB /* null.cpp */; }; - DF093ECE0F63CB26002D821E /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F00D81F4E900B6D1FB /* rate.cpp */; }; - DF093ECF0F63CB26002D821E /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F70D81F4E900B6D1FB /* adlib.cpp */; }; - DF093ED00F63CB26002D821E /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */; }; - DF093ED10F63CB26002D821E /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478210D81F4E900B6D1FB /* pcspk.cpp */; }; - DF093ED20F63CB26002D821E /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478230D81F4E900B6D1FB /* ym2612.cpp */; }; DF093ED60F63CB26002D821E /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; }; DF093ED70F63CB26002D821E /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; }; DF093ED80F63CB26002D821E /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; }; DF093ED90F63CB26002D821E /* scalebit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518A00DF34B2500854012 /* scalebit.cpp */; }; DF093EDA0F63CB26002D821E /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AA0DF34BA600854012 /* 2xsai.cpp */; }; DF093EDB0F63CB26002D821E /* aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AB0DF34BA600854012 /* aspect.cpp */; }; - DF093EDC0F63CB26002D821E /* hq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AD0DF34BA600854012 /* hq2x.cpp */; }; - DF093EDD0F63CB26002D821E /* hq3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B10DF34BA600854012 /* hq3x.cpp */; }; DF093EDE0F63CB26002D821E /* scale2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B50DF34BA600854012 /* scale2x.cpp */; }; DF093EDF0F63CB26002D821E /* scale3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B80DF34BA600854012 /* scale3x.cpp */; }; DF093EE20F63CB26002D821E /* agi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF70E7BA6A600F5680E /* agi.cpp */; }; @@ -900,7 +867,6 @@ DF09417A0F63CB26002D821E /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; }; DF09417B0F63CB26002D821E /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; }; DF09417C0F63CB26002D821E /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; }; - DF09417D0F63CB26002D821E /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */; }; DF09417E0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; }; DF09417F0F63CB26002D821E /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; }; DF0941800F63CB26002D821E /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; }; @@ -917,7 +883,6 @@ DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; }; DF09418C0F63CB26002D821E /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; }; DF0941920F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; }; - DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; }; DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; }; DF0941950F63CB26002D821E /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; }; DF0941960F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; }; @@ -989,12 +954,9 @@ DF09420D0F63CB26002D821E /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; }; DF0942100F63CB26002D821E /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; }; DF0942110F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; }; - DF0942140F63CB26002D821E /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2B80F62D91000D756B6 /* timestamp.cpp */; }; DF0942150F63CB26002D821E /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; }; DF0942160F63CB26002D821E /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; }; DF0942170F63CB26002D821E /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; }; - DF0942430F63CB9A002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942350F63CB9A002D821E /* events.cpp */; }; - DF0942450F63CB9A002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942370F63CB9A002D821E /* graphics.cpp */; }; DF0942470F63CB9A002D821E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942390F63CB9A002D821E /* main.cpp */; }; DF09424A0F63CB9A002D821E /* sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09423C0F63CB9A002D821E /* sdl.cpp */; }; DF0943730F63D1DA002D821E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; }; @@ -1029,9 +991,249 @@ DF0E303A1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; }; DF0E303B1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; }; DF0E303C1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; }; - DF0E30411252C6090082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E303F1252C6090082D593 /* cms.cpp */; }; - DF0E30421252C6090082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E303F1252C6090082D593 /* cms.cpp */; }; - DF0E30431252C6090082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E303F1252C6090082D593 /* cms.cpp */; }; + DF203F471380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; }; + DF203F481380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; }; + DF203F491380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; }; + DF203F631380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; }; + DF203F641380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; }; + DF203F651380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; }; + DF203F661380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; }; + DF203F681380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; }; + DF203F691380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; }; + DF203F6A1380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; }; + DF203F6B1380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; }; + DF203F6C1380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; }; + DF203F6D1380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; }; + DF203F6E1380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; }; + DF203F701380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; }; + DF203F711380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; }; + DF203F721380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; }; + DF203F731380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; }; + DF203F741380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; }; + DF203F751380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; }; + DF203F761380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; }; + DF203F781380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; }; + DF203F791380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; }; + DF203F7A1380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; }; + DF203F951380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; }; + DF203F961380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; }; + DF203F971380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; }; + DF203F981380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; }; + DF203F991380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; }; + DF203F9A1380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; }; + DF203F9C1380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; }; + DF203F9D1380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; }; + DF203F9E1380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; }; + DF203F9F1380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; }; + DF203FA01380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; }; + DF203FA11380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; }; + DF203FA21380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; }; + DF203FA31380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; }; + DF203FA41380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; }; + DF203FA51380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; }; + DF203FA71380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; }; + DF203FA81380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; }; + DF203FA91380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; }; + DF203FAA1380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; }; + DF203FAB1380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; }; + DF203FAC1380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; }; + DF203FAD1380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; }; + DF203FAE1380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; }; + DF203FAF1380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; }; + DF203FB01380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; }; + DF203FB21380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; }; + DF203FB31380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; }; + DF203FB41380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; }; + DF203FB51380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; }; + DF203FD51380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; }; + DF203FD61380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; }; + DF203FD71380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; }; + DF203FD81380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; }; + DF203FD91380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; }; + DF203FDA1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; }; + DF203FDB1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; }; + DF203FDC1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; }; + DF203FDD1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; }; + DF203FDE1380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; }; + DF203FDF1380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; }; + DF203FE01380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; }; + DF203FE11380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; }; + DF203FE21380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; }; + DF203FE31380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; }; + DF203FE41380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; }; + DF203FE51380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; }; + DF203FE61380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; }; + DF203FE71380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; }; + DF203FE81380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; }; + DF203FE91380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; }; + DF203FEA1380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; }; + DF203FEB1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; }; + DF203FEC1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; }; + DF203FED1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; }; + DF203FEE1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; }; + DF203FEF1380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; }; + DF203FF01380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; }; + DF203FF11380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; }; + DF203FF21380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; }; + DF203FF31380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; }; + DF203FF41380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; }; + DF203FF51380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; }; + DF203FF61380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; }; + DF203FF71380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; }; + DF203FF81380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; }; + DF203FF91380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; }; + DF203FFA1380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; }; + DF203FFB1380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; }; + DF203FFC1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; }; + DF203FFD1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; }; + DF203FFE1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; }; + DF203FFF1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; }; + DF2040001380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; }; + DF2040011380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; }; + DF2040021380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; }; + DF2040031380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; }; + DF2040041380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; }; + DF2040051380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; }; + DF2040061380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; }; + DF2040071380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; }; + DF20402E1380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; }; + DF20402F1380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; }; + DF2040301380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; }; + DF2040311380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; }; + DF2040321380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; }; + DF2040331380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; }; + DF2040341380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; }; + DF2040351380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; }; + DF2040361380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; }; + DF2040371380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; }; + DF2040381380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; }; + DF2040391380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; }; + DF20403A1380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; }; + DF20403B1380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; }; + DF20403C1380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; }; + DF20403D1380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; }; + DF20403E1380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; }; + DF20403F1380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; }; + DF20405E1380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; }; + DF20405F1380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; }; + DF2040601380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; }; + DF2040611380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; }; + DF2040621380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; }; + DF2040631380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; }; + DF2040641380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; }; + DF2040651380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; }; + DF2040661380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; }; + DF2040671380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; }; + DF2040681380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; }; + DF2040691380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; }; + DF20406A1380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; }; + DF20406B1380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; }; + DF20406C1380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; }; + DF20406D1380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; }; + DF20406E1380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; }; + DF20406F1380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; }; + DF2040701380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; }; + DF2040711380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; }; + DF2040721380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; }; + DF2040731380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; }; + DF2040741380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; }; + DF2040751380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; }; + DF2040761380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; }; + DF2040771380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; }; + DF2040781380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; }; + DF2040791380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; }; + DF20407A1380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; }; + DF20407B1380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; }; + DF20407C1380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; }; + DF20407D1380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; }; + DF20407E1380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; }; + DF20407F1380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; }; + DF2040801380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; }; + DF2040811380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; }; + DF20409A1380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; }; + DF20409B1380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; }; + DF20409C1380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; }; + DF20409D1380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; }; + DF20409E1380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; }; + DF20409F1380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; }; + DF2040A01380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; }; + DF2040A11380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; }; + DF2040A21380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; }; + DF2040A31380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; }; + DF2040A41380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; }; + DF2040A51380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; }; + DF2040A61380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; }; + DF2040A71380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; }; + DF2040A81380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; }; + DF2040A91380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; }; + DF2040AA1380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; }; + DF2040AB1380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; }; + DF2040AC1380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; }; + DF2040AD1380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; }; + DF2040AE1380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; }; + DF2040AF1380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; }; + DF2040B01380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; }; + DF2040B11380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; }; + DF2040B21380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; }; + DF2040B31380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; }; + DF2040B41380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; }; + DF2040B51380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; }; + DF2040B61380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; }; + DF2040B71380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; }; + DF2040B81380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; }; + DF2040B91380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; }; + DF2040BA1380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; }; + DF2040CC1380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; }; + DF2040CD1380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; }; + DF2040CE1380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; }; + DF2040CF1380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; }; + DF2040D01380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; }; + DF2040D11380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; }; + DF2040D21380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; }; + DF2040D31380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; }; + DF2040D41380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; }; + DF2040D51380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; }; + DF2040D61380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; }; + DF2040D71380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; }; + DF2040D81380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; }; + DF2040D91380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; }; + DF2040DA1380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; }; + DF2040DB1380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; }; + DF2040DC1380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; }; + DF2040DD1380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; }; + DF2040DE1380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; }; + DF2040DF1380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; }; + DF2040E01380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; }; + DF2040E11380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; }; + DF2040E21380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; }; + DF2040E31380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; }; + DF2040F41380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; }; + DF2040F51380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; }; + DF2040F61380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; }; + DF2040F71380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; }; + DF2040F81380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; }; + DF2040F91380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; }; + DF2040FA1380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; }; + DF2040FB1380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; }; + DF2040FC1380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; }; + DF2040FE1380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; }; + DF2040FF1380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; }; + DF2041001380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; }; + DF2041011380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; }; + DF2041021380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; }; + DF2041031380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; }; + DF2041041380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; }; + DF2041051380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; }; + DF2041061380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; }; + DF2041081380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; }; + DF2041091380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; }; + DF20410A1380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; }; + DF20410B1380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; }; + DF20410C1380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; }; + DF20410D1380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; }; + DF20410E1380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; }; + DF20410F1380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; }; + DF2041101380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; }; DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF224E020FB23BC500C8E453 /* OpenGLES.framework */; }; DF224E050FB23BC500C8E453 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF224E020FB23BC500C8E453 /* OpenGLES.framework */; }; DF2EC3E510E6490800765801 /* browser_osx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3E410E6490800765801 /* browser_osx.mm */; }; @@ -1053,15 +1255,8 @@ DF2EC50B10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; }; DF2EC50C10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; }; DF2EC50D10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; }; - DF2EC51210E64E3100765801 /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51010E64E3100765801 /* sid.cpp */; }; - DF2EC51310E64E3100765801 /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51010E64E3100765801 /* sid.cpp */; }; - DF2EC51410E64E3100765801 /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51010E64E3100765801 /* sid.cpp */; }; - DF2EC51810E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; }; - DF2EC51910E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; }; - DF2EC51A10E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; }; DF2FFB930F485D890006E566 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; }; DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; }; - DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; }; DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; }; DF2FFC290F4862520006E566 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; }; DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; }; @@ -1109,36 +1304,6 @@ DF2FFD2B0F48717F0006E566 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD290F48717F0006E566 /* Default.png */; }; DF2FFD2C0F48717F0006E566 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD2A0F48717F0006E566 /* icon.png */; }; DF2FFD2D0F48719E0006E566 /* scummclassic.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFBDB0F485E480006E566 /* scummclassic.zip */; }; - DF45B11F116627DA009B85CC /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0F7116627DA009B85CC /* adpcm.cpp */; }; - DF45B121116627DA009B85CC /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FA116627DA009B85CC /* aiff.cpp */; }; - DF45B123116627DA009B85CC /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FD116627DA009B85CC /* flac.cpp */; }; - DF45B125116627DA009B85CC /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B100116627DA009B85CC /* iff_sound.cpp */; }; - DF45B127116627DA009B85CC /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B103116627DA009B85CC /* mp3.cpp */; }; - DF45B129116627DA009B85CC /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B106116627DA009B85CC /* raw.cpp */; }; - DF45B12B116627DA009B85CC /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B109116627DA009B85CC /* vag.cpp */; }; - DF45B12D116627DA009B85CC /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10C116627DA009B85CC /* voc.cpp */; }; - DF45B12F116627DA009B85CC /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10F116627DA009B85CC /* vorbis.cpp */; }; - DF45B131116627DA009B85CC /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B112116627DA009B85CC /* wave.cpp */; }; - DF45B13D116627DA009B85CC /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0F7116627DA009B85CC /* adpcm.cpp */; }; - DF45B13F116627DA009B85CC /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FA116627DA009B85CC /* aiff.cpp */; }; - DF45B141116627DA009B85CC /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FD116627DA009B85CC /* flac.cpp */; }; - DF45B143116627DA009B85CC /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B100116627DA009B85CC /* iff_sound.cpp */; }; - DF45B145116627DA009B85CC /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B103116627DA009B85CC /* mp3.cpp */; }; - DF45B147116627DA009B85CC /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B106116627DA009B85CC /* raw.cpp */; }; - DF45B149116627DA009B85CC /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B109116627DA009B85CC /* vag.cpp */; }; - DF45B14B116627DA009B85CC /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10C116627DA009B85CC /* voc.cpp */; }; - DF45B14D116627DA009B85CC /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10F116627DA009B85CC /* vorbis.cpp */; }; - DF45B14F116627DA009B85CC /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B112116627DA009B85CC /* wave.cpp */; }; - DF45B15B116627DA009B85CC /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0F7116627DA009B85CC /* adpcm.cpp */; }; - DF45B15D116627DA009B85CC /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FA116627DA009B85CC /* aiff.cpp */; }; - DF45B15F116627DA009B85CC /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FD116627DA009B85CC /* flac.cpp */; }; - DF45B161116627DA009B85CC /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B100116627DA009B85CC /* iff_sound.cpp */; }; - DF45B163116627DA009B85CC /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B103116627DA009B85CC /* mp3.cpp */; }; - DF45B165116627DA009B85CC /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B106116627DA009B85CC /* raw.cpp */; }; - DF45B167116627DA009B85CC /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B109116627DA009B85CC /* vag.cpp */; }; - DF45B169116627DA009B85CC /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10C116627DA009B85CC /* voc.cpp */; }; - DF45B16B116627DA009B85CC /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10F116627DA009B85CC /* vorbis.cpp */; }; - DF45B16D116627DA009B85CC /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B112116627DA009B85CC /* wave.cpp */; }; DF45B1CA116628A5009B85CC /* animate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B176116628A5009B85CC /* animate.cpp */; }; DF45B1CB116628A5009B85CC /* cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B178116628A5009B85CC /* cache.cpp */; }; DF45B1CC116628A5009B85CC /* compare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17A116628A5009B85CC /* compare.cpp */; }; @@ -1229,6 +1394,137 @@ DF45B244116628A5009B85CC /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C1116628A5009B85CC /* music.cpp */; }; DF45B245116628A5009B85CC /* soundcmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C3116628A5009B85CC /* soundcmd.cpp */; }; DF45B246116628A5009B85CC /* seq_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C6116628A5009B85CC /* seq_decoder.cpp */; }; + DF46B6F31381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; }; + DF46B6F41381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; }; + DF46B6F51381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; }; + DF46B6FF1381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; }; + DF46B7001381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; }; + DF46B7011381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; }; + DF46B7021381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; }; + DF46B7031381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; }; + DF46B7041381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; }; + DF46B7051381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; }; + DF46B7061381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; }; + DF46B7071381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; }; + DF46B7081381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; }; + DF46B7091381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; }; + DF46B70A1381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; }; + DF46B7191381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; }; + DF46B71A1381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; }; + DF46B71B1381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; }; + DF46B71C1381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; }; + DF46B71D1381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; }; + DF46B71E1381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; }; + DF46B71F1381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; }; + DF46B7201381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; }; + DF46B7211381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; }; + DF46B7221381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; }; + DF46B7231381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; }; + DF46B7241381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; }; + DF46B7251381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; }; + DF46B7261381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; }; + DF46B7271381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; }; + DF46B7281381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; }; + DF46B7291381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; }; + DF46B72A1381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; }; + DF46B7441381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; }; + DF46B7451381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; }; + DF46B7461381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; }; + DF46B7491381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; }; + DF46B74A1381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; }; + DF46B74B1381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; }; + DF46B7541381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; }; + DF46B7551381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; }; + DF46B7561381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; }; + DF46B75E1381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; }; + DF46B75F1381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; }; + DF46B7601381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; }; + DF46B7631381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; }; + DF46B7641381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; }; + DF46B7651381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; }; + DF46B7671381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; }; + DF46B7681381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; }; + DF46B7691381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; }; + DF46B77B1381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; }; + DF46B77C1381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; }; + DF46B77D1381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; }; + DF46B77E1381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; }; + DF46B77F1381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; }; + DF46B7801381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; }; + DF46B7811381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; }; + DF46B7821381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; }; + DF46B7831381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; }; + DF46B7841381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; }; + DF46B7851381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; }; + DF46B7861381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; }; + DF46B7871381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; }; + DF46B7881381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; }; + DF46B7891381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; }; + DF46B7931381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; }; + DF46B7941381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; }; + DF46B7951381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; }; + DF46B7961381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; }; + DF46B7971381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; }; + DF46B7981381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; }; + DF46B79F1381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; }; + DF46B7A01381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; }; + DF46B7A11381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; }; + DF46B7A51381E5D900D08723 /* sdl-timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A31381E5D900D08723 /* sdl-timer.cpp */; }; + DF46B7A91381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; }; + DF46B7AA1381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; }; + DF46B7AB1381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; }; + DF46B7B41381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; }; + DF46B7B51381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; }; + DF46B7B61381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; }; + DF46B7BD1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; }; + DF46B7BE1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; }; + DF46B7BF1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; }; + DF46B7C81381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; }; + DF46B7C91381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; }; + DF46B7CA1381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; }; + DF46B7CF1381E76300D08723 /* sdl-events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7CD1381E76300D08723 /* sdl-events.cpp */; }; + DF46B7D61381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; }; + DF46B7D71381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; }; + DF46B7D81381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; }; + DF46B83C1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; }; + DF46B83D1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; }; + DF46B83E1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; }; + DF46B8441381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; }; + DF46B8451381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; }; + DF46B8461381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; }; + DF46B8481381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; }; + DF46B8491381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; }; + DF46B84A1381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; }; + DF46B84D1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; }; + DF46B84E1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; }; + DF46B84F1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; }; + DF46B8521381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; }; + DF46B8531381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; }; + DF46B8541381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; }; + DF46B8601381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; }; + DF46B8611381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; }; + DF46B8621381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; }; + DF46B8631381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; }; + DF46B8641381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; }; + DF46B8651381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; }; + DF46B8661381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; }; + DF46B8671381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; }; + DF46B8681381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; }; + DF46B8711381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; }; + DF46B8721381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; }; + DF46B8731381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; }; + DF46B87D1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; }; + DF46B87E1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; }; + DF46B87F1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; }; + DF46B8891381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; }; + DF46B88A1381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; }; + DF46B88B1381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; }; + DF46B8921381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; }; + DF46B8931381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; }; + DF46B8941381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; }; + DF46B89B1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; }; + DF46B89C1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; }; + DF46B89D1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; }; DF573C080F5A81EA00961A72 /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573C010F5A81EA00961A72 /* state.cpp */; }; DF573CBB0F5A85B300961A72 /* exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBA0F5A85B300961A72 /* exec.cpp */; }; DF573CBE0F5A85E100961A72 /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; }; @@ -1253,20 +1549,10 @@ DF6118550FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; }; DF6118560FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; }; DF6118570FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; }; - DF6118680FE3A9410042AD3F /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */; }; - DF6118690FE3A9410042AD3F /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118620FE3A9410042AD3F /* flic_decoder.cpp */; }; - DF61186A0FE3A9410042AD3F /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118640FE3A9410042AD3F /* smk_decoder.cpp */; }; - DF61186D0FE3A9410042AD3F /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */; }; - DF61186E0FE3A9410042AD3F /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118620FE3A9410042AD3F /* flic_decoder.cpp */; }; - DF61186F0FE3A9410042AD3F /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118640FE3A9410042AD3F /* smk_decoder.cpp */; }; - DF6118720FE3A9410042AD3F /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */; }; - DF6118730FE3A9410042AD3F /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118620FE3A9410042AD3F /* flic_decoder.cpp */; }; - DF6118740FE3A9410042AD3F /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118640FE3A9410042AD3F /* smk_decoder.cpp */; }; DF6118890FE3A9AA0042AD3F /* saveconverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */; }; DF61188A0FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; }; DF61188B0FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; }; DF61188C0FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; }; - DF61188D0FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */; }; DF61188E0FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; }; DF61188F0FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; }; DF6118900FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; }; @@ -1278,7 +1564,6 @@ DF6118960FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; }; DF6118970FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; }; DF6118980FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; }; - DF6118990FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */; }; DF61189A0FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; }; DF61189B0FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; }; DF61189C0FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; }; @@ -1290,7 +1575,6 @@ DF6118A20FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; }; DF6118A30FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; }; DF6118A40FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; }; - DF6118A50FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */; }; DF6118A60FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; }; DF6118A70FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; }; DF6118A80FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; }; @@ -1317,9 +1601,6 @@ DF6118C80FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; }; DF6118C90FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; }; DF6118CC0FE3AAFD0042AD3F /* hardwarekeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */; }; - DF6118D10FE3AB560042AD3F /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CF0FE3AB560042AD3F /* mame.cpp */; }; - DF6118D20FE3AB560042AD3F /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CF0FE3AB560042AD3F /* mame.cpp */; }; - DF6118D30FE3AB560042AD3F /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CF0FE3AB560042AD3F /* mame.cpp */; }; DF6BF4C410529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; }; DF6BF4C510529DA50069811F /* jpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C210529DA50069811F /* jpeg.cpp */; }; DF6BF4C610529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; }; @@ -1353,12 +1634,6 @@ DF6BF4FF10529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; }; DF6BF50010529F140069811F /* EventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F710529F140069811F /* EventDispatcher.cpp */; }; DF6BF50110529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; }; - DF6BF50610529F540069811F /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50210529F540069811F /* maxtrax.cpp */; }; - DF6BF50710529F540069811F /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50410529F540069811F /* tfmx.cpp */; }; - DF6BF50810529F540069811F /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50210529F540069811F /* maxtrax.cpp */; }; - DF6BF50910529F540069811F /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50410529F540069811F /* tfmx.cpp */; }; - DF6BF50A10529F540069811F /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50210529F540069811F /* maxtrax.cpp */; }; - DF6BF50B10529F540069811F /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50410529F540069811F /* tfmx.cpp */; }; DF7585CE100CB66E00CC3324 /* expression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C3100CB66E00CC3324 /* expression.cpp */; }; DF7585CF100CB66E00CC3324 /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C5100CB66E00CC3324 /* hotspots.cpp */; }; DF7585D0100CB66E00CC3324 /* init_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C7100CB66E00CC3324 /* init_v6.cpp */; }; @@ -1435,9 +1710,6 @@ DF7F289311FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; }; DF7F289511FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; }; DF7F289711FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; }; - DF7F28A011FF24B000159131 /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289E11FF24B000159131 /* mac_snd.cpp */; }; - DF7F28A111FF24B000159131 /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289E11FF24B000159131 /* mac_snd.cpp */; }; - DF7F28A211FF24B000159131 /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289E11FF24B000159131 /* mac_snd.cpp */; }; DF7F28A511FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; }; DF7F28A611FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; }; DF7F28A711FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; }; @@ -2067,28 +2339,9 @@ DF842A470E7BBBB400F5680E /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; }; DF842A490E7BBBB400F5680E /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; }; DF842A6D0E7BBD5700F5680E /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; }; - DF842A710E7BBDB200F5680E /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */; }; - DF895BFE124C24350077F6E8 /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */; }; - DF895BFF124C24350077F6E8 /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */; }; - DF895C00124C24350077F6E8 /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */; }; DF895C03124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; }; DF895C04124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; }; DF895C05124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; }; - DF895C09124C24B60077F6E8 /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C08124C24B50077F6E8 /* appleiigs.cpp */; }; - DF895C0A124C24B60077F6E8 /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C08124C24B50077F6E8 /* appleiigs.cpp */; }; - DF895C0B124C24B60077F6E8 /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C08124C24B50077F6E8 /* appleiigs.cpp */; }; - DF895C15124C24C10077F6E8 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0D124C24C00077F6E8 /* towns_audio.cpp */; }; - DF895C16124C24C10077F6E8 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */; }; - DF895C17124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */; }; - DF895C18124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */; }; - DF895C19124C24C10077F6E8 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0D124C24C00077F6E8 /* towns_audio.cpp */; }; - DF895C1A124C24C10077F6E8 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */; }; - DF895C1B124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */; }; - DF895C1C124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */; }; - DF895C1D124C24C10077F6E8 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0D124C24C00077F6E8 /* towns_audio.cpp */; }; - DF895C1E124C24C10077F6E8 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */; }; - DF895C1F124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */; }; - DF895C20124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */; }; DF895C25124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; }; DF895C26124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; }; DF895C27124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; }; @@ -2101,27 +2354,8 @@ DF895C41124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; }; DF895C42124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; }; DF895C43124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; }; - DF895CB8124E58980077F6E8 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAB124E58980077F6E8 /* indeo3.cpp */; }; - DF895CB9124E58980077F6E8 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAD124E58980077F6E8 /* mjpeg.cpp */; }; - DF895CBA124E58980077F6E8 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAF124E58980077F6E8 /* qdm2.cpp */; }; - DF895CBB124E58980077F6E8 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB2124E58980077F6E8 /* qtrle.cpp */; }; - DF895CBC124E58980077F6E8 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB4124E58980077F6E8 /* rpza.cpp */; }; - DF895CBD124E58990077F6E8 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB6124E58980077F6E8 /* smc.cpp */; }; - DF895CBE124E58990077F6E8 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAB124E58980077F6E8 /* indeo3.cpp */; }; - DF895CBF124E58990077F6E8 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAD124E58980077F6E8 /* mjpeg.cpp */; }; - DF895CC0124E58990077F6E8 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAF124E58980077F6E8 /* qdm2.cpp */; }; - DF895CC1124E58990077F6E8 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB2124E58980077F6E8 /* qtrle.cpp */; }; - DF895CC2124E58990077F6E8 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB4124E58980077F6E8 /* rpza.cpp */; }; - DF895CC3124E58990077F6E8 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB6124E58980077F6E8 /* smc.cpp */; }; - DF895CC4124E58990077F6E8 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAB124E58980077F6E8 /* indeo3.cpp */; }; - DF895CC5124E58990077F6E8 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAD124E58980077F6E8 /* mjpeg.cpp */; }; - DF895CC6124E58990077F6E8 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAF124E58980077F6E8 /* qdm2.cpp */; }; - DF895CC7124E58990077F6E8 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB2124E58980077F6E8 /* qtrle.cpp */; }; - DF895CC8124E58990077F6E8 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB4124E58980077F6E8 /* rpza.cpp */; }; - DF895CC9124E58990077F6E8 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB6124E58980077F6E8 /* smc.cpp */; }; DF89C2880F62D55C00D756B6 /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; }; DF89C2A40F62D79E00D756B6 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; }; - DF89C2BB0F62D91000D756B6 /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2B80F62D91000D756B6 /* timestamp.cpp */; }; DF90E9BF10AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; }; DF90E9C110AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; }; DF90E9C310AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; }; @@ -2131,12 +2365,6 @@ DF90EAAD10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; }; DF90EAAE10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; }; DF90EAAF10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; }; - DF90EAB810B023D100C8F93F /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAB610B023D100C8F93F /* avi_decoder.cpp */; }; - DF90EAB910B023D100C8F93F /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAB610B023D100C8F93F /* avi_decoder.cpp */; }; - DF90EABA10B023D100C8F93F /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAB610B023D100C8F93F /* avi_decoder.cpp */; }; - DF90EAC310B023F400C8F93F /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAC110B023F400C8F93F /* msvideo1.cpp */; }; - DF90EAC410B023F400C8F93F /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAC110B023F400C8F93F /* msvideo1.cpp */; }; - DF90EAC510B023F400C8F93F /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAC110B023F400C8F93F /* msvideo1.cpp */; }; DF9B9248118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; }; DF9B9249118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; }; DF9B924A118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; }; @@ -2151,12 +2379,13 @@ DFAAAFFC0F0112DF003E9390 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFFB0F0112DF003E9390 /* detection.cpp */; }; DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; }; DFAAD23D0F50120E00C3A4E2 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAD2390F50120E00C3A4E2 /* console.cpp */; }; - DFB0576911B753AF0015AE65 /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576411B753AF0015AE65 /* qt_decoder.cpp */; }; - DFB0576A11B753AF0015AE65 /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576611B753AF0015AE65 /* video_decoder.cpp */; }; - DFB0576C11B753AF0015AE65 /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576411B753AF0015AE65 /* qt_decoder.cpp */; }; - DFB0576D11B753AF0015AE65 /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576611B753AF0015AE65 /* video_decoder.cpp */; }; - DFB0576F11B753AF0015AE65 /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576411B753AF0015AE65 /* qt_decoder.cpp */; }; - DFB0577011B753AF0015AE65 /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576611B753AF0015AE65 /* video_decoder.cpp */; }; + DFADEBB313820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; }; + DFADEBB413820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; }; + DFADEBB513820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; }; + DFADEBB713820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; }; + DFADEBB813820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; }; + DFADEBB913820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; }; + DFADEC071382140300C46364 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DFADEC061382140300C46364 /* libz.dylib */; }; DFB0577611B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; }; DFB0577711B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; }; DFB0577811B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; }; @@ -2172,9 +2401,6 @@ DFB0579111B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; }; DFB0579211B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; }; DFB0579311B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; }; - DFB0579811B7549C0015AE65 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0579611B7549C0015AE65 /* cinepak.cpp */; }; - DFB0579911B7549C0015AE65 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0579611B7549C0015AE65 /* cinepak.cpp */; }; - DFB0579A11B7549C0015AE65 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0579611B7549C0015AE65 /* cinepak.cpp */; }; DFC831210F48AF19005EF03C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301A0F48AF18005EF03C /* detection.cpp */; }; DFC831240F48AF19005EF03C /* gc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301E0F48AF18005EF03C /* gc.cpp */; }; DFC831270F48AF19005EF03C /* kernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830230F48AF18005EF03C /* kernel.cpp */; }; @@ -2204,9 +2430,6 @@ DFCDC6F711662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; }; DFCDC6F811662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; }; DFCDC6F911662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; }; - DFCDC6FE11662AD700A7D2A0 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */; }; - DFCDC6FF11662AD700A7D2A0 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */; }; - DFCDC70011662AD700A7D2A0 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */; }; DFCDC70411662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; }; DFCDC70511662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; }; DFCDC70611662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; }; @@ -2219,8 +2442,6 @@ DFD518A20DF34B2500854012 /* scalebit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518A00DF34B2500854012 /* scalebit.cpp */; }; DFD518BC0DF34BA600854012 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AA0DF34BA600854012 /* 2xsai.cpp */; }; DFD518BD0DF34BA600854012 /* aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AB0DF34BA600854012 /* aspect.cpp */; }; - DFD518BF0DF34BA600854012 /* hq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AD0DF34BA600854012 /* hq2x.cpp */; }; - DFD518C20DF34BA600854012 /* hq3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B10DF34BA600854012 /* hq3x.cpp */; }; DFD518C50DF34BA600854012 /* scale2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B50DF34BA600854012 /* scale2x.cpp */; }; DFD518C70DF34BA600854012 /* scale3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B80DF34BA600854012 /* scale3x.cpp */; }; DFD6470C0F495B51008E18EF /* unzip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C10D81F4E800B6D1FB /* unzip.cpp */; }; @@ -2253,7 +2474,6 @@ DFE47BFF0D81F4E900B6D1FB /* consolefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */; }; DFE47C000D81F4E900B6D1FB /* newfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775E0D81F4E900B6D1FB /* newfont.cpp */; }; DFE47C010D81F4E900B6D1FB /* newfont_big.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */; }; - DFE47C020D81F4E900B6D1FB /* scummfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477600D81F4E900B6D1FB /* scummfont.cpp */; }; DFE47C030D81F4E900B6D1FB /* iff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477610D81F4E900B6D1FB /* iff.cpp */; }; DFE47C040D81F4E900B6D1FB /* imagedec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477630D81F4E900B6D1FB /* imagedec.cpp */; }; DFE47C080D81F4E900B6D1FB /* primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4776A0D81F4E900B6D1FB /* primitives.cpp */; }; @@ -2265,41 +2485,14 @@ DFE47C200D81F4E900B6D1FB /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; }; DFE47C210D81F4E900B6D1FB /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; }; DFE47C220D81F4E900B6D1FB /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; }; - DFE47C230D81F4E900B6D1FB /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477980D81F4E900B6D1FB /* editable.cpp */; }; - DFE47C240D81F4E900B6D1FB /* EditTextWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */; }; DFE47C260D81F4E900B6D1FB /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; }; DFE47C280D81F4E900B6D1FB /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; }; - DFE47C290D81F4E900B6D1FB /* ListWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */; }; DFE47C2A0D81F4E900B6D1FB /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; }; DFE47C2B0D81F4E900B6D1FB /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; }; DFE47C2E0D81F4E900B6D1FB /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; }; DFE47C2F0D81F4E900B6D1FB /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; }; - DFE47C300D81F4E900B6D1FB /* PopUpWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */; }; - DFE47C310D81F4E900B6D1FB /* ScrollBarWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */; }; - DFE47C320D81F4E900B6D1FB /* TabWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */; }; DFE47C350D81F4E900B6D1FB /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; }; DFE47C3B0D81F4E900B6D1FB /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; }; - DFE47C3E0D81F4E900B6D1FB /* audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */; }; - DFE47C3F0D81F4E900B6D1FB /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */; }; - DFE47C410D81F4E900B6D1FB /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D10D81F4E900B6D1FB /* fmopl.cpp */; }; - DFE47C430D81F4E900B6D1FB /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D50D81F4E900B6D1FB /* mididrv.cpp */; }; - DFE47C440D81F4E900B6D1FB /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D70D81F4E900B6D1FB /* midiparser.cpp */; }; - DFE47C450D81F4E900B6D1FB /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */; }; - DFE47C460D81F4E900B6D1FB /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */; }; - DFE47C470D81F4E900B6D1FB /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DB0D81F4E900B6D1FB /* mixer.cpp */; }; - DFE47C480D81F4E900B6D1FB /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */; }; - DFE47C490D81F4E900B6D1FB /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E00D81F4E900B6D1FB /* module.cpp */; }; - DFE47C4A0D81F4E900B6D1FB /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E20D81F4E900B6D1FB /* paula.cpp */; }; - DFE47C4B0D81F4E900B6D1FB /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E40D81F4E900B6D1FB /* protracker.cpp */; }; - DFE47C4C0D81F4E900B6D1FB /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E60D81F4E900B6D1FB /* rjp1.cpp */; }; - DFE47C4D0D81F4E900B6D1FB /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E80D81F4E900B6D1FB /* soundfx.cpp */; }; - DFE47C500D81F4E900B6D1FB /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */; }; - DFE47C510D81F4E900B6D1FB /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477EF0D81F4E900B6D1FB /* null.cpp */; }; - DFE47C520D81F4E900B6D1FB /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F00D81F4E900B6D1FB /* rate.cpp */; }; - DFE47C570D81F4E900B6D1FB /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F70D81F4E900B6D1FB /* adlib.cpp */; }; - DFE47C580D81F4E900B6D1FB /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */; }; - DFE47C740D81F4E900B6D1FB /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478210D81F4E900B6D1FB /* pcspk.cpp */; }; - DFE47C750D81F4E900B6D1FB /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478230D81F4E900B6D1FB /* ym2612.cpp */; }; DFE47C870D81F86900B6D1FB /* kyra.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C810D81F86900B6D1FB /* kyra.dat */; }; DFE47C880D81F86900B6D1FB /* lure.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C820D81F86900B6D1FB /* lure.dat */; }; DFE47C890D81F86900B6D1FB /* queen.tbl in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C830D81F86900B6D1FB /* queen.tbl */; }; @@ -2315,11 +2508,6 @@ DFEC5D361166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; }; DFEC5D371166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; }; DFEC5D381166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; }; - DFEC5D3F1166C6B400C90552 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D3D1166C6B400C90552 /* dbopl.cpp */; }; - DFEC5D401166C6B400C90552 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D3D1166C6B400C90552 /* dbopl.cpp */; }; - DFEC5D411166C6B400C90552 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D3D1166C6B400C90552 /* dbopl.cpp */; }; - DFF958AF0FB222F300A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; }; - DFF958B20FB222F300A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; }; DFF959050FB22D3000A3EC78 /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476C0F49F7EF008E18EF /* libmad.a */; }; DFF959060FB22D3100A3EC78 /* libFLAC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476B0F49F7EF008E18EF /* libFLAC.a */; }; DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476F0F49F7EF008E18EF /* libvorbisidec.a */; }; @@ -2360,7 +2548,6 @@ DFF959320FB22D5700A3EC78 /* consolefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */; }; DFF959330FB22D5700A3EC78 /* newfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775E0D81F4E900B6D1FB /* newfont.cpp */; }; DFF959340FB22D5700A3EC78 /* newfont_big.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */; }; - DFF959350FB22D5700A3EC78 /* scummfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477600D81F4E900B6D1FB /* scummfont.cpp */; }; DFF959360FB22D5700A3EC78 /* iff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477610D81F4E900B6D1FB /* iff.cpp */; }; DFF959370FB22D5700A3EC78 /* imagedec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477630D81F4E900B6D1FB /* imagedec.cpp */; }; DFF959380FB22D5700A3EC78 /* primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4776A0D81F4E900B6D1FB /* primitives.cpp */; }; @@ -2372,49 +2559,20 @@ DFF9593E0FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; }; DFF9593F0FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; }; DFF959400FB22D5700A3EC78 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; }; - DFF959410FB22D5700A3EC78 /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477980D81F4E900B6D1FB /* editable.cpp */; }; - DFF959420FB22D5700A3EC78 /* EditTextWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */; }; DFF959430FB22D5700A3EC78 /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; }; DFF959440FB22D5700A3EC78 /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; }; - DFF959450FB22D5700A3EC78 /* ListWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */; }; DFF959460FB22D5700A3EC78 /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; }; DFF959470FB22D5700A3EC78 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; }; DFF959480FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; }; DFF959490FB22D5700A3EC78 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; }; - DFF9594A0FB22D5700A3EC78 /* PopUpWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */; }; - DFF9594B0FB22D5700A3EC78 /* ScrollBarWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */; }; - DFF9594C0FB22D5700A3EC78 /* TabWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */; }; DFF9594D0FB22D5700A3EC78 /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; }; DFF9594E0FB22D5700A3EC78 /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; }; - DFF959510FB22D5700A3EC78 /* audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */; }; - DFF959520FB22D5700A3EC78 /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */; }; - DFF959540FB22D5700A3EC78 /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D10D81F4E900B6D1FB /* fmopl.cpp */; }; - DFF959560FB22D5700A3EC78 /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D50D81F4E900B6D1FB /* mididrv.cpp */; }; - DFF959570FB22D5700A3EC78 /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D70D81F4E900B6D1FB /* midiparser.cpp */; }; - DFF959580FB22D5700A3EC78 /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */; }; - DFF959590FB22D5700A3EC78 /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */; }; - DFF9595A0FB22D5700A3EC78 /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DB0D81F4E900B6D1FB /* mixer.cpp */; }; - DFF9595B0FB22D5700A3EC78 /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */; }; - DFF9595C0FB22D5700A3EC78 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E00D81F4E900B6D1FB /* module.cpp */; }; - DFF9595D0FB22D5700A3EC78 /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E20D81F4E900B6D1FB /* paula.cpp */; }; - DFF9595E0FB22D5700A3EC78 /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E40D81F4E900B6D1FB /* protracker.cpp */; }; - DFF9595F0FB22D5700A3EC78 /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E60D81F4E900B6D1FB /* rjp1.cpp */; }; - DFF959600FB22D5700A3EC78 /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E80D81F4E900B6D1FB /* soundfx.cpp */; }; - DFF959620FB22D5700A3EC78 /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */; }; - DFF959630FB22D5700A3EC78 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477EF0D81F4E900B6D1FB /* null.cpp */; }; - DFF959640FB22D5700A3EC78 /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F00D81F4E900B6D1FB /* rate.cpp */; }; - DFF959650FB22D5700A3EC78 /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F70D81F4E900B6D1FB /* adlib.cpp */; }; - DFF959660FB22D5700A3EC78 /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */; }; - DFF959670FB22D5700A3EC78 /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478210D81F4E900B6D1FB /* pcspk.cpp */; }; - DFF959680FB22D5700A3EC78 /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478230D81F4E900B6D1FB /* ym2612.cpp */; }; DFF9596C0FB22D5700A3EC78 /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; }; DFF9596D0FB22D5700A3EC78 /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; }; DFF9596E0FB22D5700A3EC78 /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; }; DFF9596F0FB22D5700A3EC78 /* scalebit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518A00DF34B2500854012 /* scalebit.cpp */; }; DFF959700FB22D5700A3EC78 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AA0DF34BA600854012 /* 2xsai.cpp */; }; DFF959710FB22D5700A3EC78 /* aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AB0DF34BA600854012 /* aspect.cpp */; }; - DFF959720FB22D5700A3EC78 /* hq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AD0DF34BA600854012 /* hq2x.cpp */; }; - DFF959730FB22D5700A3EC78 /* hq3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B10DF34BA600854012 /* hq3x.cpp */; }; DFF959740FB22D5700A3EC78 /* scale2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B50DF34BA600854012 /* scale2x.cpp */; }; DFF959750FB22D5700A3EC78 /* scale3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B80DF34BA600854012 /* scale3x.cpp */; }; DFF959760FB22D5700A3EC78 /* iphone_keyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = DF841FD90E7BA61800F5680E /* iphone_keyboard.m */; }; @@ -3037,7 +3195,6 @@ DFF95C0F0FB22D5700A3EC78 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; }; DFF95C100FB22D5700A3EC78 /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; }; DFF95C110FB22D5700A3EC78 /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; }; - DFF95C120FB22D5700A3EC78 /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */; }; DFF95C130FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; }; DFF95C140FB22D5700A3EC78 /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; }; DFF95C150FB22D5700A3EC78 /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; }; @@ -3054,7 +3211,6 @@ DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; }; DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; }; DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; }; - DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; }; DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; }; DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; }; DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; }; @@ -3126,7 +3282,6 @@ DFF95C920FB22D5700A3EC78 /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; }; DFF95C940FB22D5700A3EC78 /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; }; DFF95C950FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; }; - DFF95C980FB22D5700A3EC78 /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2B80F62D91000D756B6 /* timestamp.cpp */; }; DFF95C990FB22D5700A3EC78 /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; }; DFF95C9A0FB22D5700A3EC78 /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; }; DFF95C9B0FB22D5700A3EC78 /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; }; @@ -3141,13 +3296,90 @@ DFF95CB30FB22D5700A3EC78 /* inter_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */; }; DFF95CB40FB22D5700A3EC78 /* script_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */; }; DFF95CB50FB22D5700A3EC78 /* script_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */; }; - DFF95CB70FB22D5700A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; }; DFF95CBC0FB22D5700A3EC78 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A160E7BB34E00F5680E /* CoreAudio.framework */; }; DFF95CBD0FB22D5700A3EC78 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; }; DFF95CBE0FB22D5700A3EC78 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A180E7BB34E00F5680E /* Foundation.framework */; }; DFF95CBF0FB22D5700A3EC78 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A190E7BB34E00F5680E /* UIKit.framework */; }; DFF95CC00FB22D5700A3EC78 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A270E7BB37500F5680E /* AudioToolbox.framework */; }; DFF95CC10FB22D5700A3EC78 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A2E0E7BB39E00F5680E /* QuartzCore.framework */; }; + F92B4DCE139DD428000D1BF1 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DCC139DD428000D1BF1 /* quicktime.cpp */; }; + F92B4DCF139DD428000D1BF1 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DCC139DD428000D1BF1 /* quicktime.cpp */; }; + F92B4DD0139DD428000D1BF1 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DCC139DD428000D1BF1 /* quicktime.cpp */; }; + F92B4DD3139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */; }; + F92B4DD4139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */; }; + F92B4DD5139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */; }; + F92B4DDA139DDC92000D1BF1 /* macosx-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD7139DDC92000D1BF1 /* macosx-main.cpp */; }; + F92B4DDB139DDC92000D1BF1 /* macosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD8139DDC92000D1BF1 /* macosx.cpp */; }; + F9946D90139E1A260072D195 /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D7A139E1A260072D195 /* cdtoons.cpp */; }; + F9946D91139E1A260072D195 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D7C139E1A260072D195 /* cinepak.cpp */; }; + F9946D92139E1A260072D195 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D7F139E1A260072D195 /* indeo3.cpp */; }; + F9946D93139E1A260072D195 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D81139E1A260072D195 /* mjpeg.cpp */; }; + F9946D94139E1A260072D195 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D83139E1A260072D195 /* msrle.cpp */; }; + F9946D95139E1A260072D195 /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D85139E1A260072D195 /* msvideo1.cpp */; }; + F9946D96139E1A260072D195 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D87139E1A260072D195 /* qtrle.cpp */; }; + F9946D97139E1A260072D195 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D89139E1A260072D195 /* rpza.cpp */; }; + F9946D98139E1A260072D195 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D8B139E1A260072D195 /* smc.cpp */; }; + F9946D99139E1A260072D195 /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D8D139E1A260072D195 /* truemotion1.cpp */; }; + F9946D9D139E1A560072D195 /* towns_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9A139E1A560072D195 /* towns_midi.cpp */; }; + F9946D9E139E1A560072D195 /* towns_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9A139E1A560072D195 /* towns_midi.cpp */; }; + F9946D9F139E1A560072D195 /* towns_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9A139E1A560072D195 /* towns_midi.cpp */; }; + F9946DA0139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */; }; + F9946DA1139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */; }; + F9946DA2139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */; }; + F9946DB5139E1A880072D195 /* freeverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA3139E1A880072D195 /* freeverb.cpp */; }; + F9946DB6139E1A880072D195 /* freeverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA3139E1A880072D195 /* freeverb.cpp */; }; + F9946DB7139E1A880072D195 /* freeverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA3139E1A880072D195 /* freeverb.cpp */; }; + F9946DB8139E1A880072D195 /* i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA5139E1A880072D195 /* i386.cpp */; }; + F9946DB9139E1A880072D195 /* i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA5139E1A880072D195 /* i386.cpp */; }; + F9946DBA139E1A880072D195 /* i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA5139E1A880072D195 /* i386.cpp */; }; + F9946DBB139E1A880072D195 /* mt32_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA7139E1A880072D195 /* mt32_file.cpp */; }; + F9946DBC139E1A880072D195 /* mt32_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA7139E1A880072D195 /* mt32_file.cpp */; }; + F9946DBD139E1A880072D195 /* mt32_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA7139E1A880072D195 /* mt32_file.cpp */; }; + F9946DBE139E1A880072D195 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAA139E1A880072D195 /* part.cpp */; }; + F9946DBF139E1A880072D195 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAA139E1A880072D195 /* part.cpp */; }; + F9946DC0139E1A880072D195 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAA139E1A880072D195 /* part.cpp */; }; + F9946DC1139E1A880072D195 /* partial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAC139E1A880072D195 /* partial.cpp */; }; + F9946DC2139E1A880072D195 /* partial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAC139E1A880072D195 /* partial.cpp */; }; + F9946DC3139E1A880072D195 /* partial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAC139E1A880072D195 /* partial.cpp */; }; + F9946DC4139E1A880072D195 /* partialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAE139E1A880072D195 /* partialManager.cpp */; }; + F9946DC5139E1A880072D195 /* partialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAE139E1A880072D195 /* partialManager.cpp */; }; + F9946DC6139E1A880072D195 /* partialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAE139E1A880072D195 /* partialManager.cpp */; }; + F9946DC7139E1A880072D195 /* synth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB1139E1A880072D195 /* synth.cpp */; }; + F9946DC8139E1A880072D195 /* synth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB1139E1A880072D195 /* synth.cpp */; }; + F9946DC9139E1A880072D195 /* synth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB1139E1A880072D195 /* synth.cpp */; }; + F9946DCA139E1A880072D195 /* tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB3139E1A880072D195 /* tables.cpp */; }; + F9946DCB139E1A880072D195 /* tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB3139E1A880072D195 /* tables.cpp */; }; + F9946DCC139E1A880072D195 /* tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB3139E1A880072D195 /* tables.cpp */; }; + F9946DD6139E1AD30072D195 /* aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DCE139E1AD30072D195 /* aac.cpp */; }; + F9946DD7139E1AD30072D195 /* aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DCE139E1AD30072D195 /* aac.cpp */; }; + F9946DD8139E1AD30072D195 /* aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DCE139E1AD30072D195 /* aac.cpp */; }; + F9946DD9139E1AD30072D195 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD0139E1AD30072D195 /* qdm2.cpp */; }; + F9946DDA139E1AD30072D195 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD0139E1AD30072D195 /* qdm2.cpp */; }; + F9946DDB139E1AD30072D195 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD0139E1AD30072D195 /* qdm2.cpp */; }; + F9946DDC139E1AD30072D195 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD4139E1AD30072D195 /* quicktime.cpp */; }; + F9946DDD139E1AD30072D195 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD4139E1AD30072D195 /* quicktime.cpp */; }; + F9946DDE139E1AD30072D195 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD4139E1AD30072D195 /* quicktime.cpp */; }; + F9946DE3139E1B180072D195 /* posix-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE0139E1B180072D195 /* posix-main.cpp */; }; + F9946DE4139E1B180072D195 /* posix-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE0139E1B180072D195 /* posix-main.cpp */; }; + F9946DE5139E1B180072D195 /* posix-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE0139E1B180072D195 /* posix-main.cpp */; }; + F9946DE6139E1B180072D195 /* posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE1139E1B180072D195 /* posix.cpp */; }; + F9946DE7139E1B180072D195 /* posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE1139E1B180072D195 /* posix.cpp */; }; + F9946DE8139E1B180072D195 /* posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE1139E1B180072D195 /* posix.cpp */; }; + F9946DEC139E1B6F0072D195 /* downscaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEA139E1B6F0072D195 /* downscaler.cpp */; }; + F9946DED139E1B6F0072D195 /* downscaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEA139E1B6F0072D195 /* downscaler.cpp */; }; + F9946DEE139E1B6F0072D195 /* downscaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEA139E1B6F0072D195 /* downscaler.cpp */; }; + F9946DF1139E1BA00072D195 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEF139E1BA00072D195 /* console.cpp */; }; + F9946DF2139E1BA00072D195 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEF139E1BA00072D195 /* console.cpp */; }; + F9946DF3139E1BA00072D195 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEF139E1BA00072D195 /* console.cpp */; }; + F9946DF7139E1BBF0072D195 /* sdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */; }; + F9946DF8139E1BBF0072D195 /* sdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */; }; + F9946DF9139E1BBF0072D195 /* sdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */; }; + F9946DFE139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */; }; + F9946DFF139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */; }; + F9946E00139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */; }; + F9946E04139E1C390072D195 /* sdl-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946E02139E1C390072D195 /* sdl-graphics.cpp */; }; + F9946E05139E1C390072D195 /* sdl-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946E02139E1C390072D195 /* sdl-graphics.cpp */; }; + F9946E06139E1C3A0072D195 /* sdl-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946E02139E1C390072D195 /* sdl-graphics.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3199,12 +3431,9 @@ 8CD1ECC6126202AA00FA198C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; }; 8CD1ECC7126202AA00FA198C /* display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display.cpp; sourceTree = "<group>"; }; 8CD1ECC8126202AA00FA198C /* display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = display.h; sourceTree = "<group>"; }; - 8CD1ECC9126202AA00FA198C /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cpp; sourceTree = "<group>"; }; - 8CD1ECCA126202AA00FA198C /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = "<group>"; }; 8CD1ECCB126202AA00FA198C /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = "<group>"; }; 8CD1ECCC126202AA00FA198C /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; }; 8CD1ECCD126202AA00FA198C /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; }; - 8CD1ECCE126202AA00FA198C /* global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = global.h; sourceTree = "<group>"; }; 8CD1ECCF126202AA00FA198C /* hugo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hugo.cpp; sourceTree = "<group>"; }; 8CD1ECD0126202AA00FA198C /* hugo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugo.h; sourceTree = "<group>"; }; 8CD1ECD1126202AA00FA198C /* intro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intro.cpp; sourceTree = "<group>"; }; @@ -3301,8 +3530,6 @@ DF093E5D0F63CAD4002D821E /* script_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_pn.cpp; sourceTree = "<group>"; }; DF093E5E0F63CAD4002D821E /* vga_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_pn.cpp; sourceTree = "<group>"; }; DF09422A0F63CB26002D821E /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; }; - DF0942350F63CB9A002D821E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; }; - DF0942370F63CB9A002D821E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; }; DF0942390F63CB9A002D821E /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; DF09423C0F63CB9A002D821E /* sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl.cpp; sourceTree = "<group>"; }; DF09423D0F63CB9A002D821E /* sdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl.h; sourceTree = "<group>"; }; @@ -3335,8 +3562,151 @@ DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v3.cpp; sourceTree = "<group>"; }; DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v4.cpp; sourceTree = "<group>"; }; DF0E30391252C5BD0082D593 /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cms.cpp; sourceTree = "<group>"; }; - DF0E303F1252C6090082D593 /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cms.cpp; sourceTree = "<group>"; }; - DF0E30401252C6090082D593 /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cms.h; sourceTree = "<group>"; }; + DF203F461380C06E0056300A /* gui-manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gui-manager.cpp"; sourceTree = "<group>"; }; + DF203F531380C2740056300A /* avi_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = avi_decoder.cpp; path = ../../video/avi_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F541380C2740056300A /* avi_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avi_decoder.h; path = ../../video/avi_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F551380C2740056300A /* coktel_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = coktel_decoder.cpp; path = ../../video/coktel_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F561380C2740056300A /* coktel_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coktel_decoder.h; path = ../../video/coktel_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F571380C2740056300A /* dxa_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dxa_decoder.cpp; path = ../../video/dxa_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F581380C2740056300A /* dxa_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dxa_decoder.h; path = ../../video/dxa_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F591380C2740056300A /* flic_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flic_decoder.cpp; path = ../../video/flic_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F5A1380C2740056300A /* flic_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flic_decoder.h; path = ../../video/flic_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F5D1380C2740056300A /* qt_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qt_decoder.cpp; path = ../../video/qt_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F5E1380C2750056300A /* qt_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qt_decoder.h; path = ../../video/qt_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F5F1380C2750056300A /* smk_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smk_decoder.cpp; path = ../../video/smk_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F601380C2750056300A /* smk_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smk_decoder.h; path = ../../video/smk_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F611380C2750056300A /* video_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_decoder.cpp; path = ../../video/video_decoder.cpp; sourceTree = SOURCE_ROOT; }; + DF203F621380C2750056300A /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_decoder.h; path = ../../video/video_decoder.h; sourceTree = SOURCE_ROOT; }; + DF203F7C1380C2920056300A /* cdtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cdtoons.cpp; path = ../../video/codecs/cdtoons.cpp; sourceTree = SOURCE_ROOT; }; + DF203F7D1380C2920056300A /* cdtoons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cdtoons.h; path = ../../video/codecs/cdtoons.h; sourceTree = SOURCE_ROOT; }; + DF203F7E1380C2920056300A /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cinepak.cpp; path = ../../video/codecs/cinepak.cpp; sourceTree = SOURCE_ROOT; }; + DF203F7F1380C2920056300A /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cinepak.h; path = ../../video/codecs/cinepak.h; sourceTree = SOURCE_ROOT; }; + DF203F801380C2920056300A /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codec.h; path = ../../video/codecs/codec.h; sourceTree = SOURCE_ROOT; }; + DF203F811380C2920056300A /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = indeo3.cpp; path = ../../video/codecs/indeo3.cpp; sourceTree = SOURCE_ROOT; }; + DF203F821380C2920056300A /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = indeo3.h; path = ../../video/codecs/indeo3.h; sourceTree = SOURCE_ROOT; }; + DF203F831380C2920056300A /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mjpeg.cpp; path = ../../video/codecs/mjpeg.cpp; sourceTree = SOURCE_ROOT; }; + DF203F841380C2920056300A /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mjpeg.h; path = ../../video/codecs/mjpeg.h; sourceTree = SOURCE_ROOT; }; + DF203F851380C2920056300A /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msrle.cpp; path = ../../video/codecs/msrle.cpp; sourceTree = SOURCE_ROOT; }; + DF203F861380C2920056300A /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msrle.h; path = ../../video/codecs/msrle.h; sourceTree = SOURCE_ROOT; }; + DF203F871380C2920056300A /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msvideo1.cpp; path = ../../video/codecs/msvideo1.cpp; sourceTree = SOURCE_ROOT; }; + DF203F881380C2920056300A /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msvideo1.h; path = ../../video/codecs/msvideo1.h; sourceTree = SOURCE_ROOT; }; + DF203F8C1380C2920056300A /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qtrle.cpp; path = ../../video/codecs/qtrle.cpp; sourceTree = SOURCE_ROOT; }; + DF203F8D1380C2920056300A /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qtrle.h; path = ../../video/codecs/qtrle.h; sourceTree = SOURCE_ROOT; }; + DF203F8E1380C2920056300A /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rpza.cpp; path = ../../video/codecs/rpza.cpp; sourceTree = SOURCE_ROOT; }; + DF203F8F1380C2920056300A /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rpza.h; path = ../../video/codecs/rpza.h; sourceTree = SOURCE_ROOT; }; + DF203F901380C2920056300A /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smc.cpp; path = ../../video/codecs/smc.cpp; sourceTree = SOURCE_ROOT; }; + DF203F911380C2920056300A /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smc.h; path = ../../video/codecs/smc.h; sourceTree = SOURCE_ROOT; }; + DF203F921380C2920056300A /* truemotion1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = truemotion1.cpp; path = ../../video/codecs/truemotion1.cpp; sourceTree = SOURCE_ROOT; }; + DF203F931380C2920056300A /* truemotion1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = truemotion1.h; path = ../../video/codecs/truemotion1.h; sourceTree = SOURCE_ROOT; }; + DF203F941380C2920056300A /* truemotion1data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = truemotion1data.h; path = ../../video/codecs/truemotion1data.h; sourceTree = SOURCE_ROOT; }; + DF203FC01380C3BC0056300A /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF203FC11380C3BC0056300A /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF203FC21380C3BC0056300A /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; }; + DF203FC31380C3BC0056300A /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; }; + DF203FC41380C3BC0056300A /* file_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v1d.cpp; sourceTree = "<group>"; }; + DF203FC51380C3BC0056300A /* file_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v1w.cpp; sourceTree = "<group>"; }; + DF203FC61380C3BC0056300A /* file_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v2d.cpp; sourceTree = "<group>"; }; + DF203FC71380C3BC0056300A /* file_v2w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v2w.cpp; sourceTree = "<group>"; }; + DF203FC81380C3BC0056300A /* file_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v3d.cpp; sourceTree = "<group>"; }; + DF203FC91380C3BC0056300A /* object_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v1d.cpp; sourceTree = "<group>"; }; + DF203FCA1380C3BC0056300A /* object_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v1w.cpp; sourceTree = "<group>"; }; + DF203FCB1380C3BC0056300A /* object_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v2d.cpp; sourceTree = "<group>"; }; + DF203FCC1380C3BC0056300A /* object_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v3d.cpp; sourceTree = "<group>"; }; + DF203FCD1380C3BC0056300A /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; }; + DF203FCE1380C3BC0056300A /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; + DF203FCF1380C3BC0056300A /* parser_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v1d.cpp; sourceTree = "<group>"; }; + DF203FD01380C3BC0056300A /* parser_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v1w.cpp; sourceTree = "<group>"; }; + DF203FD11380C3BC0056300A /* parser_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v2d.cpp; sourceTree = "<group>"; }; + DF203FD21380C3BC0056300A /* parser_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v3d.cpp; sourceTree = "<group>"; }; + DF203FD31380C3BC0056300A /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; }; + DF203FD41380C3BC0056300A /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; }; + DF2040221380C8B70056300A /* editable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = editable.cpp; path = widgets/editable.cpp; sourceTree = "<group>"; }; + DF2040231380C8B70056300A /* editable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = editable.h; path = widgets/editable.h; sourceTree = "<group>"; }; + DF2040241380C8B70056300A /* edittext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = edittext.cpp; path = widgets/edittext.cpp; sourceTree = "<group>"; }; + DF2040251380C8B70056300A /* edittext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = edittext.h; path = widgets/edittext.h; sourceTree = "<group>"; }; + DF2040261380C8B70056300A /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = list.cpp; path = widgets/list.cpp; sourceTree = "<group>"; }; + DF2040271380C8B70056300A /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = list.h; path = widgets/list.h; sourceTree = "<group>"; }; + DF2040281380C8B70056300A /* popup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = popup.cpp; path = widgets/popup.cpp; sourceTree = "<group>"; }; + DF2040291380C8B70056300A /* popup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = popup.h; path = widgets/popup.h; sourceTree = "<group>"; }; + DF20402A1380C8B70056300A /* scrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scrollbar.cpp; path = widgets/scrollbar.cpp; sourceTree = "<group>"; }; + DF20402B1380C8B70056300A /* scrollbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scrollbar.h; path = widgets/scrollbar.h; sourceTree = "<group>"; }; + DF20402C1380C8B70056300A /* tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tab.cpp; path = widgets/tab.cpp; sourceTree = "<group>"; }; + DF20402D1380C8B70056300A /* tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tab.h; path = widgets/tab.h; sourceTree = "<group>"; }; + DF2040471380CA230056300A /* audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audiostream.cpp; path = ../../audio/audiostream.cpp; sourceTree = SOURCE_ROOT; }; + DF2040481380CA230056300A /* audiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audiostream.h; path = ../../audio/audiostream.h; sourceTree = SOURCE_ROOT; }; + DF2040491380CA230056300A /* fmopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fmopl.cpp; path = ../../audio/fmopl.cpp; sourceTree = SOURCE_ROOT; }; + DF20404A1380CA230056300A /* fmopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fmopl.h; path = ../../audio/fmopl.h; sourceTree = SOURCE_ROOT; }; + DF20404B1380CA230056300A /* mididrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mididrv.cpp; path = ../../audio/mididrv.cpp; sourceTree = SOURCE_ROOT; }; + DF20404C1380CA230056300A /* mididrv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mididrv.h; path = ../../audio/mididrv.h; sourceTree = SOURCE_ROOT; }; + DF20404D1380CA230056300A /* midiparser_smf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser_smf.cpp; path = ../../audio/midiparser_smf.cpp; sourceTree = SOURCE_ROOT; }; + DF20404E1380CA230056300A /* midiparser_xmidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser_xmidi.cpp; path = ../../audio/midiparser_xmidi.cpp; sourceTree = SOURCE_ROOT; }; + DF20404F1380CA230056300A /* midiparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser.cpp; path = ../../audio/midiparser.cpp; sourceTree = SOURCE_ROOT; }; + DF2040501380CA230056300A /* midiparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midiparser.h; path = ../../audio/midiparser.h; sourceTree = SOURCE_ROOT; }; + DF2040511380CA230056300A /* midiplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiplayer.cpp; path = ../../audio/midiplayer.cpp; sourceTree = SOURCE_ROOT; }; + DF2040521380CA230056300A /* midiplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midiplayer.h; path = ../../audio/midiplayer.h; sourceTree = SOURCE_ROOT; }; + DF2040531380CA230056300A /* mixer_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer_intern.h; path = ../../audio/mixer_intern.h; sourceTree = SOURCE_ROOT; }; + DF2040541380CA230056300A /* mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mixer.cpp; path = ../../audio/mixer.cpp; sourceTree = SOURCE_ROOT; }; + DF2040551380CA230056300A /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer.h; path = ../../audio/mixer.h; sourceTree = SOURCE_ROOT; }; + DF2040561380CA230056300A /* mpu401.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mpu401.cpp; path = ../../audio/mpu401.cpp; sourceTree = SOURCE_ROOT; }; + DF2040571380CA230056300A /* mpu401.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpu401.h; path = ../../audio/mpu401.h; sourceTree = SOURCE_ROOT; }; + DF2040581380CA230056300A /* musicplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = musicplugin.cpp; path = ../../audio/musicplugin.cpp; sourceTree = SOURCE_ROOT; }; + DF2040591380CA230056300A /* musicplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = musicplugin.h; path = ../../audio/musicplugin.h; sourceTree = SOURCE_ROOT; }; + DF20405A1380CA230056300A /* rate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rate.cpp; path = ../../audio/rate.cpp; sourceTree = SOURCE_ROOT; }; + DF20405B1380CA230056300A /* rate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rate.h; path = ../../audio/rate.h; sourceTree = SOURCE_ROOT; }; + DF20405C1380CA230056300A /* timestamp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = timestamp.cpp; path = ../../audio/timestamp.cpp; sourceTree = SOURCE_ROOT; }; + DF20405D1380CA230056300A /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = timestamp.h; path = ../../audio/timestamp.h; sourceTree = SOURCE_ROOT; }; + DF2040831380CA400056300A /* adpcm_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adpcm_intern.h; path = ../../audio/decoders/adpcm_intern.h; sourceTree = SOURCE_ROOT; }; + DF2040841380CA400056300A /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adpcm.cpp; path = ../../audio/decoders/adpcm.cpp; sourceTree = SOURCE_ROOT; }; + DF2040851380CA400056300A /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adpcm.h; path = ../../audio/decoders/adpcm.h; sourceTree = SOURCE_ROOT; }; + DF2040861380CA400056300A /* aiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aiff.cpp; path = ../../audio/decoders/aiff.cpp; sourceTree = SOURCE_ROOT; }; + DF2040871380CA400056300A /* aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aiff.h; path = ../../audio/decoders/aiff.h; sourceTree = SOURCE_ROOT; }; + DF2040881380CA400056300A /* flac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flac.cpp; path = ../../audio/decoders/flac.cpp; sourceTree = SOURCE_ROOT; }; + DF2040891380CA400056300A /* flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flac.h; path = ../../audio/decoders/flac.h; sourceTree = SOURCE_ROOT; }; + DF20408A1380CA400056300A /* iff_sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iff_sound.cpp; path = ../../audio/decoders/iff_sound.cpp; sourceTree = SOURCE_ROOT; }; + DF20408B1380CA400056300A /* iff_sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iff_sound.h; path = ../../audio/decoders/iff_sound.h; sourceTree = SOURCE_ROOT; }; + DF20408C1380CA400056300A /* mac_snd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mac_snd.cpp; path = ../../audio/decoders/mac_snd.cpp; sourceTree = SOURCE_ROOT; }; + DF20408D1380CA400056300A /* mac_snd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mac_snd.h; path = ../../audio/decoders/mac_snd.h; sourceTree = SOURCE_ROOT; }; + DF20408E1380CA400056300A /* mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mp3.cpp; path = ../../audio/decoders/mp3.cpp; sourceTree = SOURCE_ROOT; }; + DF20408F1380CA400056300A /* mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mp3.h; path = ../../audio/decoders/mp3.h; sourceTree = SOURCE_ROOT; }; + DF2040901380CA400056300A /* raw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = raw.cpp; path = ../../audio/decoders/raw.cpp; sourceTree = SOURCE_ROOT; }; + DF2040911380CA400056300A /* raw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = raw.h; path = ../../audio/decoders/raw.h; sourceTree = SOURCE_ROOT; }; + DF2040921380CA400056300A /* vag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vag.cpp; path = ../../audio/decoders/vag.cpp; sourceTree = SOURCE_ROOT; }; + DF2040931380CA400056300A /* vag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vag.h; path = ../../audio/decoders/vag.h; sourceTree = SOURCE_ROOT; }; + DF2040941380CA400056300A /* voc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = voc.cpp; path = ../../audio/decoders/voc.cpp; sourceTree = SOURCE_ROOT; }; + DF2040951380CA400056300A /* voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = voc.h; path = ../../audio/decoders/voc.h; sourceTree = SOURCE_ROOT; }; + DF2040961380CA400056300A /* vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vorbis.cpp; path = ../../audio/decoders/vorbis.cpp; sourceTree = SOURCE_ROOT; }; + DF2040971380CA400056300A /* vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vorbis.h; path = ../../audio/decoders/vorbis.h; sourceTree = SOURCE_ROOT; }; + DF2040981380CA400056300A /* wave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wave.cpp; path = ../../audio/decoders/wave.cpp; sourceTree = SOURCE_ROOT; }; + DF2040991380CA400056300A /* wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wave.h; path = ../../audio/decoders/wave.h; sourceTree = SOURCE_ROOT; }; + DF2040BC1380CA810056300A /* infogrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = infogrames.cpp; path = ../../audio/mods/infogrames.cpp; sourceTree = SOURCE_ROOT; }; + DF2040BD1380CA810056300A /* infogrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = infogrames.h; path = ../../audio/mods/infogrames.h; sourceTree = SOURCE_ROOT; }; + DF2040BE1380CA810056300A /* maxtrax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = maxtrax.cpp; path = ../../audio/mods/maxtrax.cpp; sourceTree = SOURCE_ROOT; }; + DF2040BF1380CA810056300A /* maxtrax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maxtrax.h; path = ../../audio/mods/maxtrax.h; sourceTree = SOURCE_ROOT; }; + DF2040C01380CA810056300A /* module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../audio/mods/module.cpp; sourceTree = SOURCE_ROOT; }; + DF2040C11380CA810056300A /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = module.h; path = ../../audio/mods/module.h; sourceTree = SOURCE_ROOT; }; + DF2040C21380CA810056300A /* paula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = paula.cpp; path = ../../audio/mods/paula.cpp; sourceTree = SOURCE_ROOT; }; + DF2040C31380CA810056300A /* paula.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = paula.h; path = ../../audio/mods/paula.h; sourceTree = SOURCE_ROOT; }; + DF2040C41380CA810056300A /* protracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = protracker.cpp; path = ../../audio/mods/protracker.cpp; sourceTree = SOURCE_ROOT; }; + DF2040C51380CA810056300A /* protracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = protracker.h; path = ../../audio/mods/protracker.h; sourceTree = SOURCE_ROOT; }; + DF2040C61380CA810056300A /* rjp1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rjp1.cpp; path = ../../audio/mods/rjp1.cpp; sourceTree = SOURCE_ROOT; }; + DF2040C71380CA810056300A /* rjp1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rjp1.h; path = ../../audio/mods/rjp1.h; sourceTree = SOURCE_ROOT; }; + DF2040C81380CA810056300A /* soundfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = soundfx.cpp; path = ../../audio/mods/soundfx.cpp; sourceTree = SOURCE_ROOT; }; + DF2040C91380CA810056300A /* soundfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soundfx.h; path = ../../audio/mods/soundfx.h; sourceTree = SOURCE_ROOT; }; + DF2040CA1380CA810056300A /* tfmx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tfmx.cpp; path = ../../audio/mods/tfmx.cpp; sourceTree = SOURCE_ROOT; }; + DF2040CB1380CA810056300A /* tfmx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tfmx.h; path = ../../audio/mods/tfmx.h; sourceTree = SOURCE_ROOT; }; + DF2040E51380CAA40056300A /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adlib.cpp; path = ../../audio/softsynth/adlib.cpp; sourceTree = SOURCE_ROOT; }; + DF2040E61380CAA40056300A /* appleiigs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = appleiigs.cpp; path = ../../audio/softsynth/appleiigs.cpp; sourceTree = SOURCE_ROOT; }; + DF2040E71380CAA40056300A /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cms.cpp; path = ../../audio/softsynth/cms.cpp; sourceTree = SOURCE_ROOT; }; + DF2040E81380CAA40056300A /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cms.h; path = ../../audio/softsynth/cms.h; sourceTree = SOURCE_ROOT; }; + DF2040E91380CAA40056300A /* eas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = eas.cpp; path = ../../audio/softsynth/eas.cpp; sourceTree = SOURCE_ROOT; }; + DF2040EA1380CAA40056300A /* emumidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emumidi.h; path = ../../audio/softsynth/emumidi.h; sourceTree = SOURCE_ROOT; }; + DF2040EB1380CAA40056300A /* fluidsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fluidsynth.cpp; path = ../../audio/softsynth/fluidsynth.cpp; sourceTree = SOURCE_ROOT; }; + DF2040EC1380CAA40056300A /* mt32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mt32.cpp; path = ../../audio/softsynth/mt32.cpp; sourceTree = SOURCE_ROOT; }; + DF2040ED1380CAA40056300A /* pcspk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcspk.cpp; path = ../../audio/softsynth/pcspk.cpp; sourceTree = SOURCE_ROOT; }; + DF2040EE1380CAA40056300A /* pcspk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pcspk.h; path = ../../audio/softsynth/pcspk.h; sourceTree = SOURCE_ROOT; }; + DF2040EF1380CAA40056300A /* sid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sid.cpp; path = ../../audio/softsynth/sid.cpp; sourceTree = SOURCE_ROOT; }; + DF2040F01380CAA40056300A /* sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sid.h; path = ../../audio/softsynth/sid.h; sourceTree = SOURCE_ROOT; }; + DF2040F11380CAA40056300A /* wave6581.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wave6581.cpp; path = ../../audio/softsynth/wave6581.cpp; sourceTree = SOURCE_ROOT; }; DF224E020FB23BC500C8E453 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; DF2EC3E410E6490800765801 /* browser_osx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = browser_osx.mm; sourceTree = "<group>"; }; DF2EC3F610E64C0C00765801 /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; }; @@ -3350,16 +3720,12 @@ DF2EC50010E64D7C00765801 /* player_sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_sid.h; sourceTree = "<group>"; }; DF2EC50910E64DB300765801 /* textconsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textconsole.cpp; sourceTree = "<group>"; }; DF2EC50A10E64DB300765801 /* textconsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textconsole.h; sourceTree = "<group>"; }; - DF2EC51010E64E3100765801 /* sid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sid.cpp; sourceTree = "<group>"; }; - DF2EC51110E64E3100765801 /* sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sid.h; sourceTree = "<group>"; }; - DF2EC51710E64EE600765801 /* wave6581.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wave6581.cpp; sourceTree = "<group>"; }; DF2FFB900F485D890006E566 /* dither.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dither.cpp; sourceTree = "<group>"; }; DF2FFB910F485D890006E566 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; }; DF2FFB920F485D890006E566 /* pixelformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixelformat.h; sourceTree = "<group>"; }; DF2FFBD10F485DFB0006E566 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; }; DF2FFBD20F485DFB0006E566 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; }; - DF2FFBD50F485E360006E566 /* gui-manager.hcpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui-manager.hcpp; sourceTree = "<group>"; }; - DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui-manager.h; sourceTree = "<group>"; }; + DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gui-manager.h"; sourceTree = "<group>"; }; DF2FFBDB0F485E480006E566 /* scummclassic.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = scummclassic.zip; sourceTree = "<group>"; }; DF2FFBF80F4860A60006E566 /* posix-saves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-saves.cpp"; sourceTree = "<group>"; }; DF2FFBF90F4860A60006E566 /* posix-saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-saves.h"; sourceTree = "<group>"; }; @@ -3437,26 +3803,6 @@ DF2FFD0F0F4870E50006E566 /* tucker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tucker.h; sourceTree = "<group>"; }; DF2FFD290F48717F0006E566 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; }; DF2FFD2A0F48717F0006E566 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; }; - DF45B0F7116627DA009B85CC /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adpcm.cpp; sourceTree = "<group>"; }; - DF45B0F8116627DA009B85CC /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; }; - DF45B0FA116627DA009B85CC /* aiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aiff.cpp; sourceTree = "<group>"; }; - DF45B0FB116627DA009B85CC /* aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aiff.h; sourceTree = "<group>"; }; - DF45B0FD116627DA009B85CC /* flac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flac.cpp; sourceTree = "<group>"; }; - DF45B0FE116627DA009B85CC /* flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flac.h; sourceTree = "<group>"; }; - DF45B100116627DA009B85CC /* iff_sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff_sound.cpp; sourceTree = "<group>"; }; - DF45B101116627DA009B85CC /* iff_sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iff_sound.h; sourceTree = "<group>"; }; - DF45B103116627DA009B85CC /* mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp3.cpp; sourceTree = "<group>"; }; - DF45B104116627DA009B85CC /* mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mp3.h; sourceTree = "<group>"; }; - DF45B106116627DA009B85CC /* raw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = raw.cpp; sourceTree = "<group>"; }; - DF45B107116627DA009B85CC /* raw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = raw.h; sourceTree = "<group>"; }; - DF45B109116627DA009B85CC /* vag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vag.cpp; sourceTree = "<group>"; }; - DF45B10A116627DA009B85CC /* vag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vag.h; sourceTree = "<group>"; }; - DF45B10C116627DA009B85CC /* voc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = voc.cpp; sourceTree = "<group>"; }; - DF45B10D116627DA009B85CC /* voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = voc.h; sourceTree = "<group>"; }; - DF45B10F116627DA009B85CC /* vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vorbis.cpp; sourceTree = "<group>"; }; - DF45B110116627DA009B85CC /* vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbis.h; sourceTree = "<group>"; }; - DF45B112116627DA009B85CC /* wave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wave.cpp; sourceTree = "<group>"; }; - DF45B113116627DA009B85CC /* wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wave.h; sourceTree = "<group>"; }; DF45B176116628A5009B85CC /* animate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animate.cpp; sourceTree = "<group>"; }; DF45B177116628A5009B85CC /* animate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animate.h; sourceTree = "<group>"; }; DF45B178116628A5009B85CC /* cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cache.cpp; sourceTree = "<group>"; }; @@ -3519,6 +3865,97 @@ DF45B1C4116628A5009B85CC /* soundcmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundcmd.h; sourceTree = "<group>"; }; DF45B1C6116628A5009B85CC /* seq_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seq_decoder.cpp; sourceTree = "<group>"; }; DF45B1C7116628A5009B85CC /* seq_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seq_decoder.h; sourceTree = "<group>"; }; + DF46B6F21381E18900D08723 /* coroutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coroutine.cpp; sourceTree = "<group>"; }; + DF46B6F71381E1FF00D08723 /* towns_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_audio.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_audio.cpp; sourceTree = SOURCE_ROOT; }; + DF46B6F81381E1FF00D08723 /* towns_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_audio.h; path = ../../audio/softsynth/fmtowns_pc98/towns_audio.h; sourceTree = SOURCE_ROOT; }; + DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_euphony.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_euphony.cpp; sourceTree = SOURCE_ROOT; }; + DF46B6FA1381E1FF00D08723 /* towns_euphony.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_euphony.h; path = ../../audio/softsynth/fmtowns_pc98/towns_euphony.h; sourceTree = SOURCE_ROOT; }; + DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_driver.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp; sourceTree = SOURCE_ROOT; }; + DF46B6FC1381E1FF00D08723 /* towns_pc98_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_pc98_driver.h; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_driver.h; sourceTree = SOURCE_ROOT; }; + DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_fmsynth.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp; sourceTree = SOURCE_ROOT; }; + DF46B6FE1381E1FF00D08723 /* towns_pc98_fmsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_pc98_fmsynth.h; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h; sourceTree = SOURCE_ROOT; }; + DF46B70F1381E27000D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF46B7101381E27000D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF46B7111381E27000D08723 /* databases.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = databases.cpp; sourceTree = "<group>"; }; + DF46B7121381E27000D08723 /* databases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = databases.h; sourceTree = "<group>"; }; + DF46B7131381E27000D08723 /* dbase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dbase.cpp; sourceTree = "<group>"; }; + DF46B7141381E27000D08723 /* dbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbase.h; sourceTree = "<group>"; }; + DF46B7151381E27000D08723 /* iniconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iniconfig.cpp; sourceTree = "<group>"; }; + DF46B7161381E27000D08723 /* iniconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iniconfig.h; sourceTree = "<group>"; }; + DF46B7171381E27000D08723 /* init_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v7.cpp; sourceTree = "<group>"; }; + DF46B7181381E27000D08723 /* inter_inca2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_inca2.cpp; sourceTree = "<group>"; }; + DF46B7421381E40500D08723 /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = log/log.cpp; sourceTree = "<group>"; }; + DF46B7431381E40500D08723 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = log/log.h; sourceTree = "<group>"; }; + DF46B7471381E40F00D08723 /* modular-backend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "modular-backend.cpp"; sourceTree = "<group>"; }; + DF46B7481381E40F00D08723 /* modular-backend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "modular-backend.h"; sourceTree = "<group>"; }; + DF46B7501381E46700D08723 /* actor_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor_he.h; sourceTree = "<group>"; }; + DF46B7511381E46700D08723 /* player_v2base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2base.cpp; sourceTree = "<group>"; }; + DF46B7521381E46700D08723 /* player_v2base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2base.h; sourceTree = "<group>"; }; + DF46B7531381E46700D08723 /* player_v2cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2cms.h; sourceTree = "<group>"; }; + DF46B75B1381E4A400D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF46B75C1381E4A400D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF46B75D1381E4A400D08723 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; }; + DF46B7611381E4D400D08723 /* robot_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = robot_decoder.cpp; sourceTree = "<group>"; }; + DF46B7621381E4D400D08723 /* robot_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = robot_decoder.h; sourceTree = "<group>"; }; + DF46B7661381E4E400D08723 /* vm_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vm_types.cpp; sourceTree = "<group>"; }; + DF46B76E1381E54200D08723 /* bufferedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bufferedstream.h; sourceTree = "<group>"; }; + DF46B76F1381E54200D08723 /* dcl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dcl.cpp; sourceTree = "<group>"; }; + DF46B7701381E54200D08723 /* dcl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dcl.h; sourceTree = "<group>"; }; + DF46B7711381E54200D08723 /* forbidden.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = forbidden.h; sourceTree = "<group>"; }; + DF46B7721381E54200D08723 /* iff_container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff_container.cpp; sourceTree = "<group>"; }; + DF46B7731381E54200D08723 /* substream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = substream.h; sourceTree = "<group>"; }; + DF46B7741381E54200D08723 /* translation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = translation.h; sourceTree = "<group>"; }; + DF46B7751381E54200D08723 /* winexe_ne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe_ne.cpp; sourceTree = "<group>"; }; + DF46B7761381E54200D08723 /* winexe_ne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe_ne.h; sourceTree = "<group>"; }; + DF46B7771381E54200D08723 /* winexe_pe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe_pe.cpp; sourceTree = "<group>"; }; + DF46B7781381E54200D08723 /* winexe_pe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe_pe.h; sourceTree = "<group>"; }; + DF46B7791381E54200D08723 /* winexe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe.cpp; sourceTree = "<group>"; }; + DF46B77A1381E54200D08723 /* winexe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe.h; sourceTree = "<group>"; }; + DF46B78E1381E58000D08723 /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; }; + DF46B78F1381E58000D08723 /* png.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = png.cpp; sourceTree = "<group>"; }; + DF46B7901381E58000D08723 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = png.h; sourceTree = "<group>"; }; + DF46B7911381E58000D08723 /* wincursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wincursor.cpp; sourceTree = "<group>"; }; + DF46B7921381E58000D08723 /* wincursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wincursor.h; sourceTree = "<group>"; }; + DF46B79D1381E5B500D08723 /* winfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winfont.cpp; sourceTree = "<group>"; }; + DF46B79E1381E5B500D08723 /* winfont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winfont.h; sourceTree = "<group>"; }; + DF46B7A31381E5D900D08723 /* sdl-timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-timer.cpp"; path = "sdl/sdl-timer.cpp"; sourceTree = "<group>"; }; + DF46B7A41381E5D900D08723 /* sdl-timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-timer.h"; path = "sdl/sdl-timer.h"; sourceTree = "<group>"; }; + DF46B7A81381E5F100D08723 /* header.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = header.cpp; sourceTree = "<group>"; }; + DF46B7B21381E67800D08723 /* sdl-mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-mutex.cpp"; path = "mutex/sdl/sdl-mutex.cpp"; sourceTree = "<group>"; }; + DF46B7B31381E67800D08723 /* sdl-mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-mutex.h"; path = "mutex/sdl/sdl-mutex.h"; sourceTree = "<group>"; }; + DF46B7BB1381E6C000D08723 /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; }; + DF46B7BC1381E6C000D08723 /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; + DF46B7C61381E72500D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF46B7C71381E72500D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF46B7CD1381E76300D08723 /* sdl-events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-events.cpp"; path = "events/sdl/sdl-events.cpp"; sourceTree = "<group>"; }; + DF46B7CE1381E76300D08723 /* sdl-events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-events.h"; path = "events/sdl/sdl-events.h"; sourceTree = "<group>"; }; + DF46B7D41381E7C600D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF46B7D51381E7C600D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF46B83B1381F13500D08723 /* saveload_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v7.cpp; sourceTree = "<group>"; }; + DF46B8431381F35500D08723 /* saveload_inca2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_inca2.cpp; sourceTree = "<group>"; }; + DF46B8471381F38700D08723 /* inter_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v7.cpp; sourceTree = "<group>"; }; + DF46B84B1381F39E00D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF46B84C1381F39E00D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF46B8501381F3B400D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + DF46B8511381F3B400D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + DF46B85A1381F44E00D08723 /* dbopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dbopl.cpp; path = ../../audio/softsynth/opl/dbopl.cpp; sourceTree = SOURCE_ROOT; }; + DF46B85B1381F44E00D08723 /* dbopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dbopl.h; path = ../../audio/softsynth/opl/dbopl.h; sourceTree = SOURCE_ROOT; }; + DF46B85C1381F44E00D08723 /* dosbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dosbox.cpp; path = ../../audio/softsynth/opl/dosbox.cpp; sourceTree = SOURCE_ROOT; }; + DF46B85D1381F44E00D08723 /* dosbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dosbox.h; path = ../../audio/softsynth/opl/dosbox.h; sourceTree = SOURCE_ROOT; }; + DF46B85E1381F44E00D08723 /* mame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mame.cpp; path = ../../audio/softsynth/opl/mame.cpp; sourceTree = SOURCE_ROOT; }; + DF46B85F1381F44E00D08723 /* mame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mame.h; path = ../../audio/softsynth/opl/mame.h; sourceTree = SOURCE_ROOT; }; + DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-audiocd.cpp"; path = "audiocd/sdl/sdl-audiocd.cpp"; sourceTree = "<group>"; }; + DF46B8701381F4A200D08723 /* sdl-audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-audiocd.h"; path = "audiocd/sdl/sdl-audiocd.h"; sourceTree = "<group>"; }; + DF46B87B1381F4F200D08723 /* default-audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "default-audiocd.cpp"; path = "audiocd/default/default-audiocd.cpp"; sourceTree = "<group>"; }; + DF46B87C1381F4F200D08723 /* default-audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "default-audiocd.h"; path = "audiocd/default/default-audiocd.h"; sourceTree = "<group>"; }; + DF46B8801381F4FF00D08723 /* audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audiocd.h; path = audiocd/audiocd.h; sourceTree = "<group>"; }; + DF46B8851381F56400D08723 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; }; + DF46B8871381F5D800D08723 /* sdl-provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-provider.cpp"; path = "sdl/sdl-provider.cpp"; sourceTree = "<group>"; }; + DF46B8881381F5D800D08723 /* sdl-provider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-provider.h"; path = "sdl/sdl-provider.h"; sourceTree = "<group>"; }; + DF46B8901381F62B00D08723 /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adpcm.cpp; sourceTree = "<group>"; }; + DF46B8911381F62B00D08723 /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; }; + DF46B8991381F6C400D08723 /* null.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = null.cpp; path = ../../audio/null.cpp; sourceTree = SOURCE_ROOT; }; + DF46B89A1381F6C400D08723 /* null.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = null.h; path = ../../audio/null.h; sourceTree = SOURCE_ROOT; }; DF573BFE0F5A81EA00961A72 /* kernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel.h; sourceTree = "<group>"; }; DF573BFF0F5A81EA00961A72 /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; }; DF573C000F5A81EA00961A72 /* seg_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seg_manager.h; sourceTree = "<group>"; }; @@ -3542,19 +3979,11 @@ DF6118450FE3A8250042AD3F /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; }; DF6118460FE3A8250042AD3F /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; }; DF6118540FE3A8990042AD3F /* disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk.cpp; sourceTree = "<group>"; }; - DF6118590FE3A9020042AD3F /* helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = helper.h; sourceTree = "<group>"; }; - DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dxa_decoder.cpp; sourceTree = "<group>"; }; - DF6118610FE3A9410042AD3F /* dxa_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dxa_decoder.h; sourceTree = "<group>"; }; - DF6118620FE3A9410042AD3F /* flic_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flic_decoder.cpp; sourceTree = "<group>"; }; - DF6118630FE3A9410042AD3F /* flic_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flic_decoder.h; sourceTree = "<group>"; }; - DF6118640FE3A9410042AD3F /* smk_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smk_decoder.cpp; sourceTree = "<group>"; }; - DF6118650FE3A9410042AD3F /* smk_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smk_decoder.h; sourceTree = "<group>"; }; DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter.cpp; sourceTree = "<group>"; }; DF61187A0FE3A9AA0042AD3F /* saveconverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveconverter.h; sourceTree = "<group>"; }; DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v2.cpp; sourceTree = "<group>"; }; DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v3.cpp; sourceTree = "<group>"; }; DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v4.cpp; sourceTree = "<group>"; }; - DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v6.cpp; sourceTree = "<group>"; }; DF61187F0FE3A9AA0042AD3F /* savefile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savefile.cpp; sourceTree = "<group>"; }; DF6118800FE3A9AA0042AD3F /* savefile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savefile.h; sourceTree = "<group>"; }; DF6118810FE3A9AA0042AD3F /* savehandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savehandler.cpp; sourceTree = "<group>"; }; @@ -3573,8 +4002,6 @@ DF6118B70FE3AA280042AD3F /* text_lol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_lol.h; sourceTree = "<group>"; }; DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2cms.cpp; sourceTree = "<group>"; }; DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hardwarekeys.cpp; sourceTree = "<group>"; }; - DF6118CF0FE3AB560042AD3F /* mame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mame.cpp; sourceTree = "<group>"; }; - DF6118D00FE3AB560042AD3F /* mame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mame.h; sourceTree = "<group>"; }; DF6BF4C010529DA50069811F /* conversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conversion.cpp; sourceTree = "<group>"; }; DF6BF4C110529DA50069811F /* conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conversion.h; sourceTree = "<group>"; }; DF6BF4C210529DA50069811F /* jpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg.cpp; sourceTree = "<group>"; }; @@ -3593,10 +4020,6 @@ DF6BF4F910529F140069811F /* EventRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventRecorder.h; sourceTree = "<group>"; }; DF6BF4FA10529F140069811F /* list_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list_intern.h; sourceTree = "<group>"; }; DF6BF4FB10529F140069811F /* serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serializer.h; sourceTree = "<group>"; }; - DF6BF50210529F540069811F /* maxtrax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxtrax.cpp; sourceTree = "<group>"; }; - DF6BF50310529F540069811F /* maxtrax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maxtrax.h; sourceTree = "<group>"; }; - DF6BF50410529F540069811F /* tfmx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tfmx.cpp; sourceTree = "<group>"; }; - DF6BF50510529F540069811F /* tfmx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tfmx.h; sourceTree = "<group>"; }; DF7585C3100CB66E00CC3324 /* expression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expression.cpp; sourceTree = "<group>"; }; DF7585C4100CB66E00CC3324 /* expression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expression.h; sourceTree = "<group>"; }; DF7585C5100CB66E00CC3324 /* hotspots.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotspots.cpp; sourceTree = "<group>"; }; @@ -3657,8 +4080,6 @@ DF7F288911FF244F00159131 /* Tooltip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Tooltip.cpp; sourceTree = "<group>"; }; DF7F288A11FF244F00159131 /* Tooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tooltip.h; sourceTree = "<group>"; }; DF7F289111FF247300159131 /* translation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translation.cpp; sourceTree = "<group>"; }; - DF7F289E11FF24B000159131 /* mac_snd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mac_snd.cpp; sourceTree = "<group>"; }; - DF7F289F11FF24B000159131 /* mac_snd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mac_snd.h; sourceTree = "<group>"; }; DF7F28A311FF24C400159131 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; DF7F28A411FF24C400159131 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; DF841FD90E7BA61800F5680E /* iphone_keyboard.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = iphone_keyboard.m; sourceTree = "<group>"; }; @@ -4701,54 +5122,21 @@ DF842A4C0E7BBBEB00F5680E /* posix-fs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-fs.h"; sourceTree = "<group>"; }; DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stdiostream.cpp; sourceTree = "<group>"; }; DF842A6C0E7BBD5700F5680E /* stdiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdiostream.h; sourceTree = "<group>"; }; - DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = musicplugin.cpp; sourceTree = "<group>"; }; - DF842A700E7BBDB200F5680E /* musicplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = musicplugin.h; sourceTree = "<group>"; }; - DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coktel_decoder.cpp; sourceTree = "<group>"; }; - DF895BFD124C24350077F6E8 /* coktel_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coktel_decoder.h; sourceTree = "<group>"; }; DF895C01124C24680077F6E8 /* player_towns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_towns.cpp; sourceTree = "<group>"; }; DF895C02124C24680077F6E8 /* player_towns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_towns.h; sourceTree = "<group>"; }; - DF895C08124C24B50077F6E8 /* appleiigs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = appleiigs.cpp; sourceTree = "<group>"; }; - DF895C0D124C24C00077F6E8 /* towns_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_audio.cpp; sourceTree = "<group>"; }; - DF895C0E124C24C00077F6E8 /* towns_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_audio.h; sourceTree = "<group>"; }; - DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_euphony.cpp; sourceTree = "<group>"; }; - DF895C10124C24C00077F6E8 /* towns_euphony.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_euphony.h; sourceTree = "<group>"; }; - DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_pc98_driver.cpp; sourceTree = "<group>"; }; - DF895C12124C24C00077F6E8 /* towns_pc98_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_pc98_driver.h; sourceTree = "<group>"; }; - DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_pc98_fmsynth.cpp; sourceTree = "<group>"; }; - DF895C14124C24C00077F6E8 /* towns_pc98_fmsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_pc98_fmsynth.h; sourceTree = "<group>"; }; DF895C23124C25150077F6E8 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; }; DF895C24124C25150077F6E8 /* init_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_fascin.cpp; sourceTree = "<group>"; }; DF895C28124C25350077F6E8 /* kernel_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel_tables.h; sourceTree = "<group>"; }; DF895C29124C25350077F6E8 /* script_patches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_patches.cpp; sourceTree = "<group>"; }; DF895C33124C26660077F6E8 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72.png"; sourceTree = "<group>"; }; DF895C40124C271F0077F6E8 /* icon4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon4.png; sourceTree = "<group>"; }; - DF895CAB124E58980077F6E8 /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = indeo3.cpp; sourceTree = "<group>"; }; - DF895CAC124E58980077F6E8 /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = indeo3.h; sourceTree = "<group>"; }; - DF895CAD124E58980077F6E8 /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mjpeg.cpp; sourceTree = "<group>"; }; - DF895CAE124E58980077F6E8 /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mjpeg.h; sourceTree = "<group>"; }; - DF895CAF124E58980077F6E8 /* qdm2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qdm2.cpp; sourceTree = "<group>"; }; - DF895CB0124E58980077F6E8 /* qdm2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qdm2.h; sourceTree = "<group>"; }; - DF895CB1124E58980077F6E8 /* qdm2data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qdm2data.h; sourceTree = "<group>"; }; - DF895CB2124E58980077F6E8 /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qtrle.cpp; sourceTree = "<group>"; }; - DF895CB3124E58980077F6E8 /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qtrle.h; sourceTree = "<group>"; }; - DF895CB4124E58980077F6E8 /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rpza.cpp; sourceTree = "<group>"; }; - DF895CB5124E58980077F6E8 /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rpza.h; sourceTree = "<group>"; }; - DF895CB6124E58980077F6E8 /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smc.cpp; sourceTree = "<group>"; }; - DF895CB7124E58980077F6E8 /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smc.h; sourceTree = "<group>"; }; DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprites_lol.cpp; sourceTree = "<group>"; }; DF89C2A30F62D79E00D756B6 /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; }; - DF89C2B80F62D91000D756B6 /* timestamp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timestamp.cpp; sourceTree = "<group>"; }; - DF89C2B90F62D91000D756B6 /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timestamp.h; sourceTree = "<group>"; }; DF90E9B410AEDA5300C8F93F /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; }; DF90E9BD10AEDA9B00C8F93F /* selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selector.cpp; sourceTree = "<group>"; }; DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_playtoons.cpp; sourceTree = "<group>"; }; DF90EAAB10B0236F00C8F93F /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; }; DF90EAAC10B0236F00C8F93F /* staticres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = staticres.h; sourceTree = "<group>"; }; - DF90EAB610B023D100C8F93F /* avi_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = avi_decoder.cpp; sourceTree = "<group>"; }; - DF90EAB710B023D100C8F93F /* avi_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avi_decoder.h; sourceTree = "<group>"; }; - DF90EAC010B023F400C8F93F /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; }; - DF90EAC110B023F400C8F93F /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msvideo1.cpp; sourceTree = "<group>"; }; - DF90EAC210B023F400C8F93F /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvideo1.h; sourceTree = "<group>"; }; DF9B9246118E46730069C19D /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = "<group>"; }; DF9B9247118E46730069C19D /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; }; DF9B924F118E46A00069C19D /* fontsjis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fontsjis.cpp; sourceTree = "<group>"; }; @@ -4761,10 +5149,10 @@ DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thumbnail_intern.cpp; sourceTree = "<group>"; }; DFAAD2390F50120E00C3A4E2 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; DFAAD23A0F50120E00C3A4E2 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; - DFB0576411B753AF0015AE65 /* qt_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qt_decoder.cpp; sourceTree = "<group>"; }; - DFB0576511B753AF0015AE65 /* qt_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qt_decoder.h; sourceTree = "<group>"; }; - DFB0576611B753AF0015AE65 /* video_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_decoder.cpp; sourceTree = "<group>"; }; - DFB0576711B753AF0015AE65 /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video_decoder.h; sourceTree = "<group>"; }; + DFADEBB113820DF500C46364 /* maccursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maccursor.cpp; sourceTree = "<group>"; }; + DFADEBB213820DF500C46364 /* maccursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maccursor.h; sourceTree = "<group>"; }; + DFADEBB613820E0C00C46364 /* posix-fs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-fs.cpp"; sourceTree = "<group>"; }; + DFADEC061382140300C46364 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; DFB0577311B753DA0015AE65 /* debug-channels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "debug-channels.h"; sourceTree = "<group>"; }; DFB0577411B753DA0015AE65 /* rational.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rational.cpp; sourceTree = "<group>"; }; DFB0577511B753DA0015AE65 /* rational.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rational.h; sourceTree = "<group>"; }; @@ -4775,8 +5163,6 @@ DFB0578911B754570015AE65 /* maciconbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maciconbar.h; sourceTree = "<group>"; }; DFB0578F11B7547D0015AE65 /* pict.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pict.cpp; sourceTree = "<group>"; }; DFB0579011B7547D0015AE65 /* pict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pict.h; sourceTree = "<group>"; }; - DFB0579611B7549C0015AE65 /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cinepak.cpp; sourceTree = "<group>"; }; - DFB0579711B7549C0015AE65 /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cinepak.h; sourceTree = "<group>"; }; DFC8301A0F48AF18005EF03C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; }; DFC8301E0F48AF18005EF03C /* gc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gc.cpp; sourceTree = "<group>"; }; DFC8301F0F48AF18005EF03C /* gc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gc.h; sourceTree = "<group>"; }; @@ -4805,8 +5191,6 @@ DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kparse.cpp; sourceTree = "<group>"; }; DFCDC6D8116629CE00A7D2A0 /* selector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selector.h; sourceTree = "<group>"; }; DFCDC6F611662AAB00A7D2A0 /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; }; - DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msrle.cpp; sourceTree = "<group>"; }; - DFCDC6FD11662AD700A7D2A0 /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msrle.h; sourceTree = "<group>"; }; DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_fascin.cpp; sourceTree = "<group>"; }; DFCDC70911662B6B00A7D2A0 /* macresman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macresman.cpp; sourceTree = "<group>"; }; DFCDC70A11662B6B00A7D2A0 /* macresman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macresman.h; sourceTree = "<group>"; }; @@ -4820,8 +5204,6 @@ DFD518A10DF34B2500854012 /* scalebit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scalebit.h; sourceTree = "<group>"; }; DFD518AA0DF34BA600854012 /* 2xsai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 2xsai.cpp; sourceTree = "<group>"; }; DFD518AB0DF34BA600854012 /* aspect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aspect.cpp; sourceTree = "<group>"; }; - DFD518AD0DF34BA600854012 /* hq2x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hq2x.cpp; sourceTree = "<group>"; }; - DFD518B10DF34BA600854012 /* hq3x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hq3x.cpp; sourceTree = "<group>"; }; DFD518B50DF34BA600854012 /* scale2x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scale2x.cpp; sourceTree = "<group>"; }; DFD518B60DF34BA600854012 /* scale2x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scale2x.h; sourceTree = "<group>"; }; DFD518B80DF34BA600854012 /* scale3x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scale3x.cpp; sourceTree = "<group>"; }; @@ -4911,7 +5293,6 @@ DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = consolefont.cpp; sourceTree = "<group>"; }; DFE4775E0D81F4E900B6D1FB /* newfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = newfont.cpp; sourceTree = "<group>"; }; DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = newfont_big.cpp; sourceTree = "<group>"; }; - DFE477600D81F4E900B6D1FB /* scummfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scummfont.cpp; sourceTree = "<group>"; }; DFE477610D81F4E900B6D1FB /* iff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff.cpp; sourceTree = "<group>"; }; DFE477620D81F4E900B6D1FB /* iff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iff.h; sourceTree = "<group>"; }; DFE477630D81F4E900B6D1FB /* imagedec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagedec.cpp; sourceTree = "<group>"; }; @@ -4935,16 +5316,10 @@ DFE477950D81F4E900B6D1FB /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; }; DFE477960D81F4E900B6D1FB /* dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialog.cpp; sourceTree = "<group>"; }; DFE477970D81F4E900B6D1FB /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialog.h; sourceTree = "<group>"; }; - DFE477980D81F4E900B6D1FB /* editable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable.cpp; sourceTree = "<group>"; }; - DFE477990D81F4E900B6D1FB /* editable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editable.h; sourceTree = "<group>"; }; - DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditTextWidget.cpp; sourceTree = "<group>"; }; - DFE4779B0D81F4E900B6D1FB /* EditTextWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditTextWidget.h; sourceTree = "<group>"; }; DFE4779E0D81F4E900B6D1FB /* Key.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Key.cpp; sourceTree = "<group>"; }; DFE4779F0D81F4E900B6D1FB /* Key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Key.h; sourceTree = "<group>"; }; DFE477A20D81F4E900B6D1FB /* launcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = launcher.cpp; sourceTree = "<group>"; }; DFE477A30D81F4E900B6D1FB /* launcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = launcher.h; sourceTree = "<group>"; }; - DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListWidget.cpp; sourceTree = "<group>"; }; - DFE477A50D81F4E900B6D1FB /* ListWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListWidget.h; sourceTree = "<group>"; }; DFE477A60D81F4E900B6D1FB /* massadd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = massadd.cpp; sourceTree = "<group>"; }; DFE477A70D81F4E900B6D1FB /* massadd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = massadd.h; sourceTree = "<group>"; }; DFE477A80D81F4E900B6D1FB /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; }; @@ -4953,54 +5328,10 @@ DFE477AE0D81F4E900B6D1FB /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; DFE477AF0D81F4E900B6D1FB /* options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = options.cpp; sourceTree = "<group>"; }; DFE477B00D81F4E900B6D1FB /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = options.h; sourceTree = "<group>"; }; - DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PopUpWidget.cpp; sourceTree = "<group>"; }; - DFE477B20D81F4E900B6D1FB /* PopUpWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopUpWidget.h; sourceTree = "<group>"; }; - DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollBarWidget.cpp; sourceTree = "<group>"; }; - DFE477B40D81F4E900B6D1FB /* ScrollBarWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollBarWidget.h; sourceTree = "<group>"; }; - DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TabWidget.cpp; sourceTree = "<group>"; }; - DFE477B60D81F4E900B6D1FB /* TabWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabWidget.h; sourceTree = "<group>"; }; DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = themebrowser.cpp; sourceTree = "<group>"; }; DFE477BB0D81F4E900B6D1FB /* themebrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = themebrowser.h; sourceTree = "<group>"; }; DFE477C40D81F4E900B6D1FB /* widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget.cpp; sourceTree = "<group>"; }; DFE477C50D81F4E900B6D1FB /* widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = "<group>"; }; - DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiocd.cpp; sourceTree = "<group>"; }; - DFE477CC0D81F4E900B6D1FB /* audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiocd.h; sourceTree = "<group>"; }; - DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiostream.cpp; sourceTree = "<group>"; }; - DFE477CE0D81F4E900B6D1FB /* audiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiostream.h; sourceTree = "<group>"; }; - DFE477D10D81F4E900B6D1FB /* fmopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmopl.cpp; sourceTree = "<group>"; }; - DFE477D20D81F4E900B6D1FB /* fmopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmopl.h; sourceTree = "<group>"; }; - DFE477D50D81F4E900B6D1FB /* mididrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mididrv.cpp; sourceTree = "<group>"; }; - DFE477D60D81F4E900B6D1FB /* mididrv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mididrv.h; sourceTree = "<group>"; }; - DFE477D70D81F4E900B6D1FB /* midiparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser.cpp; sourceTree = "<group>"; }; - DFE477D80D81F4E900B6D1FB /* midiparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midiparser.h; sourceTree = "<group>"; }; - DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_smf.cpp; sourceTree = "<group>"; }; - DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_xmidi.cpp; sourceTree = "<group>"; }; - DFE477DB0D81F4E900B6D1FB /* mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mixer.cpp; sourceTree = "<group>"; }; - DFE477DC0D81F4E900B6D1FB /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mixer.h; sourceTree = "<group>"; }; - DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = infogrames.cpp; sourceTree = "<group>"; }; - DFE477DF0D81F4E900B6D1FB /* infogrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infogrames.h; sourceTree = "<group>"; }; - DFE477E00D81F4E900B6D1FB /* module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = module.cpp; sourceTree = "<group>"; }; - DFE477E10D81F4E900B6D1FB /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module.h; sourceTree = "<group>"; }; - DFE477E20D81F4E900B6D1FB /* paula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paula.cpp; sourceTree = "<group>"; }; - DFE477E30D81F4E900B6D1FB /* paula.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paula.h; sourceTree = "<group>"; }; - DFE477E40D81F4E900B6D1FB /* protracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protracker.cpp; sourceTree = "<group>"; }; - DFE477E50D81F4E900B6D1FB /* protracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = protracker.h; sourceTree = "<group>"; }; - DFE477E60D81F4E900B6D1FB /* rjp1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rjp1.cpp; sourceTree = "<group>"; }; - DFE477E70D81F4E900B6D1FB /* rjp1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rjp1.h; sourceTree = "<group>"; }; - DFE477E80D81F4E900B6D1FB /* soundfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundfx.cpp; sourceTree = "<group>"; }; - DFE477E90D81F4E900B6D1FB /* soundfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundfx.h; sourceTree = "<group>"; }; - DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mpu401.cpp; sourceTree = "<group>"; }; - DFE477EE0D81F4E900B6D1FB /* mpu401.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpu401.h; sourceTree = "<group>"; }; - DFE477EF0D81F4E900B6D1FB /* null.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = null.cpp; sourceTree = "<group>"; }; - DFE477F00D81F4E900B6D1FB /* rate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rate.cpp; sourceTree = "<group>"; }; - DFE477F10D81F4E900B6D1FB /* rate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rate.h; sourceTree = "<group>"; }; - DFE477F70D81F4E900B6D1FB /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; }; - DFE477F80D81F4E900B6D1FB /* emumidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emumidi.h; sourceTree = "<group>"; }; - DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fluidsynth.cpp; sourceTree = "<group>"; }; - DFE478210D81F4E900B6D1FB /* pcspk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcspk.cpp; sourceTree = "<group>"; }; - DFE478220D81F4E900B6D1FB /* pcspk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcspk.h; sourceTree = "<group>"; }; - DFE478230D81F4E900B6D1FB /* ym2612.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ym2612.cpp; sourceTree = "<group>"; }; - DFE478240D81F4E900B6D1FB /* ym2612.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ym2612.h; sourceTree = "<group>"; }; DFE47C810D81F86900B6D1FB /* kyra.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = kyra.dat; sourceTree = "<group>"; }; DFE47C820D81F86900B6D1FB /* lure.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = lure.dat; sourceTree = "<group>"; }; DFE47C830D81F86900B6D1FB /* queen.tbl */ = {isa = PBXFileReference; lastKnownFileType = file; path = queen.tbl; sourceTree = "<group>"; }; @@ -5015,12 +5346,82 @@ DFEC5D0F1166C5CF00C90552 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; }; DFEC5D341166C67300C90552 /* savestate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savestate.cpp; sourceTree = "<group>"; }; DFEC5D351166C67300C90552 /* savestate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savestate.h; sourceTree = "<group>"; }; - DFEC5D3D1166C6B400C90552 /* dbopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dbopl.cpp; sourceTree = "<group>"; }; - DFEC5D3E1166C6B400C90552 /* dbopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbopl.h; sourceTree = "<group>"; }; DFF4DFFC0F4B449F00C50BC7 /* Info.plist.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist.in; sourceTree = "<group>"; }; - DFF958A90FB222F300A3EC78 /* dosbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dosbox.cpp; sourceTree = "<group>"; }; - DFF958AA0FB222F300A3EC78 /* dosbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dosbox.h; sourceTree = "<group>"; }; DFF95CCA0FB22D5700A3EC78 /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F92B4DCB139DD428000D1BF1 /* memstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memstream.h; sourceTree = "<group>"; }; + F92B4DCC139DD428000D1BF1 /* quicktime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quicktime.cpp; sourceTree = "<group>"; }; + F92B4DCD139DD428000D1BF1 /* quicktime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quicktime.h; sourceTree = "<group>"; }; + F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = yuv_to_rgb.cpp; sourceTree = "<group>"; }; + F92B4DD2139DD449000D1BF1 /* yuv_to_rgb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = yuv_to_rgb.h; sourceTree = "<group>"; }; + F92B4DD6139DDC7A000D1BF1 /* sdl-sys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sdl-sys.h"; sourceTree = "<group>"; }; + F92B4DD7139DDC92000D1BF1 /* macosx-main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "macosx-main.cpp"; path = "sdl/macosx/macosx-main.cpp"; sourceTree = "<group>"; }; + F92B4DD8139DDC92000D1BF1 /* macosx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macosx.cpp; path = sdl/macosx/macosx.cpp; sourceTree = "<group>"; }; + F92B4DD9139DDC92000D1BF1 /* macosx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macosx.h; path = sdl/macosx/macosx.h; sourceTree = "<group>"; }; + F9946D7A139E1A260072D195 /* cdtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cdtoons.cpp; sourceTree = "<group>"; }; + F9946D7B139E1A260072D195 /* cdtoons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdtoons.h; sourceTree = "<group>"; }; + F9946D7C139E1A260072D195 /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cinepak.cpp; sourceTree = "<group>"; }; + F9946D7D139E1A260072D195 /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cinepak.h; sourceTree = "<group>"; }; + F9946D7E139E1A260072D195 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; }; + F9946D7F139E1A260072D195 /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = indeo3.cpp; sourceTree = "<group>"; }; + F9946D80139E1A260072D195 /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = indeo3.h; sourceTree = "<group>"; }; + F9946D81139E1A260072D195 /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mjpeg.cpp; sourceTree = "<group>"; }; + F9946D82139E1A260072D195 /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mjpeg.h; sourceTree = "<group>"; }; + F9946D83139E1A260072D195 /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msrle.cpp; sourceTree = "<group>"; }; + F9946D84139E1A260072D195 /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msrle.h; sourceTree = "<group>"; }; + F9946D85139E1A260072D195 /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msvideo1.cpp; sourceTree = "<group>"; }; + F9946D86139E1A260072D195 /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvideo1.h; sourceTree = "<group>"; }; + F9946D87139E1A260072D195 /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qtrle.cpp; sourceTree = "<group>"; }; + F9946D88139E1A260072D195 /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qtrle.h; sourceTree = "<group>"; }; + F9946D89139E1A260072D195 /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rpza.cpp; sourceTree = "<group>"; }; + F9946D8A139E1A260072D195 /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rpza.h; sourceTree = "<group>"; }; + F9946D8B139E1A260072D195 /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smc.cpp; sourceTree = "<group>"; }; + F9946D8C139E1A260072D195 /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smc.h; sourceTree = "<group>"; }; + F9946D8D139E1A260072D195 /* truemotion1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = truemotion1.cpp; sourceTree = "<group>"; }; + F9946D8E139E1A260072D195 /* truemotion1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = truemotion1.h; sourceTree = "<group>"; }; + F9946D8F139E1A260072D195 /* truemotion1data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = truemotion1data.h; sourceTree = "<group>"; }; + F9946D9A139E1A560072D195 /* towns_midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_midi.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_midi.cpp; sourceTree = "<group>"; }; + F9946D9B139E1A560072D195 /* towns_midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_midi.h; path = ../../audio/softsynth/fmtowns_pc98/towns_midi.h; sourceTree = "<group>"; }; + F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_plugins.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp; sourceTree = "<group>"; }; + F9946DA3139E1A880072D195 /* freeverb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeverb.cpp; path = ../../audio/softsynth/mt32/freeverb.cpp; sourceTree = "<group>"; }; + F9946DA4139E1A880072D195 /* freeverb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = freeverb.h; path = ../../audio/softsynth/mt32/freeverb.h; sourceTree = "<group>"; }; + F9946DA5139E1A880072D195 /* i386.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = i386.cpp; path = ../../audio/softsynth/mt32/i386.cpp; sourceTree = "<group>"; }; + F9946DA6139E1A880072D195 /* i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = i386.h; path = ../../audio/softsynth/mt32/i386.h; sourceTree = "<group>"; }; + F9946DA7139E1A880072D195 /* mt32_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mt32_file.cpp; path = ../../audio/softsynth/mt32/mt32_file.cpp; sourceTree = "<group>"; }; + F9946DA8139E1A880072D195 /* mt32_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mt32_file.h; path = ../../audio/softsynth/mt32/mt32_file.h; sourceTree = "<group>"; }; + F9946DA9139E1A880072D195 /* mt32emu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mt32emu.h; path = ../../audio/softsynth/mt32/mt32emu.h; sourceTree = "<group>"; }; + F9946DAA139E1A880072D195 /* part.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = part.cpp; path = ../../audio/softsynth/mt32/part.cpp; sourceTree = "<group>"; }; + F9946DAB139E1A880072D195 /* part.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = part.h; path = ../../audio/softsynth/mt32/part.h; sourceTree = "<group>"; }; + F9946DAC139E1A880072D195 /* partial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = partial.cpp; path = ../../audio/softsynth/mt32/partial.cpp; sourceTree = "<group>"; }; + F9946DAD139E1A880072D195 /* partial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = partial.h; path = ../../audio/softsynth/mt32/partial.h; sourceTree = "<group>"; }; + F9946DAE139E1A880072D195 /* partialManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = partialManager.cpp; path = ../../audio/softsynth/mt32/partialManager.cpp; sourceTree = "<group>"; }; + F9946DAF139E1A880072D195 /* partialManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = partialManager.h; path = ../../audio/softsynth/mt32/partialManager.h; sourceTree = "<group>"; }; + F9946DB0139E1A880072D195 /* structures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = structures.h; path = ../../audio/softsynth/mt32/structures.h; sourceTree = "<group>"; }; + F9946DB1139E1A880072D195 /* synth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = synth.cpp; path = ../../audio/softsynth/mt32/synth.cpp; sourceTree = "<group>"; }; + F9946DB2139E1A880072D195 /* synth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = synth.h; path = ../../audio/softsynth/mt32/synth.h; sourceTree = "<group>"; }; + F9946DB3139E1A880072D195 /* tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tables.cpp; path = ../../audio/softsynth/mt32/tables.cpp; sourceTree = "<group>"; }; + F9946DB4139E1A880072D195 /* tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tables.h; path = ../../audio/softsynth/mt32/tables.h; sourceTree = "<group>"; }; + F9946DCE139E1AD30072D195 /* aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aac.cpp; path = ../../audio/decoders/aac.cpp; sourceTree = "<group>"; }; + F9946DCF139E1AD30072D195 /* aac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aac.h; path = ../../audio/decoders/aac.h; sourceTree = "<group>"; }; + F9946DD0139E1AD30072D195 /* qdm2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qdm2.cpp; path = ../../audio/decoders/qdm2.cpp; sourceTree = "<group>"; }; + F9946DD1139E1AD30072D195 /* qdm2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qdm2.h; path = ../../audio/decoders/qdm2.h; sourceTree = "<group>"; }; + F9946DD2139E1AD30072D195 /* qdm2data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qdm2data.h; path = ../../audio/decoders/qdm2data.h; sourceTree = "<group>"; }; + F9946DD3139E1AD30072D195 /* quicktime_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quicktime_intern.h; path = ../../audio/decoders/quicktime_intern.h; sourceTree = "<group>"; }; + F9946DD4139E1AD30072D195 /* quicktime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = quicktime.cpp; path = ../../audio/decoders/quicktime.cpp; sourceTree = "<group>"; }; + F9946DD5139E1AD30072D195 /* quicktime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quicktime.h; path = ../../audio/decoders/quicktime.h; sourceTree = "<group>"; }; + F9946DE0139E1B180072D195 /* posix-main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-main.cpp"; sourceTree = "<group>"; }; + F9946DE1139E1B180072D195 /* posix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = posix.cpp; sourceTree = "<group>"; }; + F9946DE2139E1B180072D195 /* posix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = posix.h; sourceTree = "<group>"; }; + F9946DE9139E1B6F0072D195 /* aspect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aspect.h; sourceTree = "<group>"; }; + F9946DEA139E1B6F0072D195 /* downscaler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downscaler.cpp; sourceTree = "<group>"; }; + F9946DEB139E1B6F0072D195 /* downscaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = downscaler.h; sourceTree = "<group>"; }; + F9946DEF139E1BA00072D195 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; }; + F9946DF0139E1BA00072D195 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; }; + F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "sdl-mixer.cpp"; sourceTree = "<group>"; }; + F9946DF6139E1BBF0072D195 /* sdl-mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sdl-mixer.h"; sourceTree = "<group>"; }; + F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "doublebuffersdl-mixer.cpp"; sourceTree = "<group>"; }; + F9946DFD139E1BEB0072D195 /* doublebuffersdl-mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "doublebuffersdl-mixer.h"; sourceTree = "<group>"; }; + F9946E02139E1C390072D195 /* sdl-graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "sdl-graphics.cpp"; sourceTree = "<group>"; }; + F9946E03139E1C390072D195 /* sdl-graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sdl-graphics.h"; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -5038,6 +5439,7 @@ DFF959060FB22D3100A3EC78 /* libFLAC.a in Frameworks */, DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */, DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */, + DFADEC071382140300C46364 /* libz.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5094,6 +5496,7 @@ DF842A170E7BB34E00F5680E /* CoreFoundation.framework */, DF842A180E7BB34E00F5680E /* Foundation.framework */, DF842A190E7BB34E00F5680E /* UIKit.framework */, + DFADEC061382140300C46364 /* libz.dylib */, ); name = "Linked Frameworks"; sourceTree = "<group>"; @@ -5118,6 +5521,8 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + DF2040461380C9ED0056300A /* audio */, + DF203F521380C2470056300A /* video */, DF9B9277118E475D0069C19D /* games */, DFD6476A0F49F7D2008E18EF /* libs */, DF841FF50E7BA6A600F5680E /* engines */, @@ -5126,7 +5531,6 @@ DFE473950D81F4E800B6D1FB /* common */, DFE477520D81F4E900B6D1FB /* graphics */, DFE477880D81F4E900B6D1FB /* gui */, - DFE477C60D81F4E900B6D1FB /* sound */, 29B97317FDCFA39411CA2CEA /* Resources */, DFA2A57A118E433A00344DFD /* Resources-iPad */, 29B97323FDCFA39411CA2CEA /* Frameworks */, @@ -5179,15 +5583,33 @@ 8CD1ECC5126202AA00FA198C /* hugo */ = { isa = PBXGroup; children = ( + DF203FC01380C3BC0056300A /* console.cpp */, + DF203FC11380C3BC0056300A /* console.h */, + DF203FC21380C3BC0056300A /* dialogs.cpp */, + DF203FC31380C3BC0056300A /* dialogs.h */, + DF203FC41380C3BC0056300A /* file_v1d.cpp */, + DF203FC51380C3BC0056300A /* file_v1w.cpp */, + DF203FC61380C3BC0056300A /* file_v2d.cpp */, + DF203FC71380C3BC0056300A /* file_v2w.cpp */, + DF203FC81380C3BC0056300A /* file_v3d.cpp */, + DF203FC91380C3BC0056300A /* object_v1d.cpp */, + DF203FCA1380C3BC0056300A /* object_v1w.cpp */, + DF203FCB1380C3BC0056300A /* object_v2d.cpp */, + DF203FCC1380C3BC0056300A /* object_v3d.cpp */, + DF203FCD1380C3BC0056300A /* object.cpp */, + DF203FCE1380C3BC0056300A /* object.h */, + DF203FCF1380C3BC0056300A /* parser_v1d.cpp */, + DF203FD01380C3BC0056300A /* parser_v1w.cpp */, + DF203FD11380C3BC0056300A /* parser_v2d.cpp */, + DF203FD21380C3BC0056300A /* parser_v3d.cpp */, + DF203FD31380C3BC0056300A /* text.cpp */, + DF203FD41380C3BC0056300A /* text.h */, 8CD1ECC6126202AA00FA198C /* detection.cpp */, 8CD1ECC7126202AA00FA198C /* display.cpp */, 8CD1ECC8126202AA00FA198C /* display.h */, - 8CD1ECC9126202AA00FA198C /* engine.cpp */, - 8CD1ECCA126202AA00FA198C /* engine.h */, 8CD1ECCB126202AA00FA198C /* file.cpp */, 8CD1ECCC126202AA00FA198C /* file.h */, 8CD1ECCD126202AA00FA198C /* game.h */, - 8CD1ECCE126202AA00FA198C /* global.h */, 8CD1ECCF126202AA00FA198C /* hugo.cpp */, 8CD1ECD0126202AA00FA198C /* hugo.h */, 8CD1ECD1126202AA00FA198C /* intro.cpp */, @@ -5213,6 +5635,8 @@ 8CD1ECE3126202AA00FA198C /* toon */ = { isa = PBXGroup; children = ( + F9946DEF139E1BA00072D195 /* console.cpp */, + F9946DF0139E1BA00072D195 /* console.h */, 8CD1ECE4126202AA00FA198C /* anim.cpp */, 8CD1ECE5126202AA00FA198C /* anim.h */, 8CD1ECE6126202AA00FA198C /* audio.cpp */, @@ -5296,9 +5720,9 @@ DF09422F0F63CB9A002D821E /* sdl */ = { isa = PBXGroup; children = ( + F9946DDF139E1B180072D195 /* posix */, + F92B4DD6139DDC7A000D1BF1 /* sdl-sys.h */, DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */, - DF0942350F63CB9A002D821E /* events.cpp */, - DF0942370F63CB9A002D821E /* graphics.cpp */, DF0942390F63CB9A002D821E /* main.cpp */, DF09423C0F63CB9A002D821E /* sdl.cpp */, DF09423D0F63CB9A002D821E /* sdl.h */, @@ -5319,26 +5743,194 @@ path = demos; sourceTree = "<group>"; }; - DF2FFB940F485D950006E566 /* video */ = { + DF203F521380C2470056300A /* video */ = { isa = PBXGroup; children = ( - DF90EAB610B023D100C8F93F /* avi_decoder.cpp */, - DF90EAB710B023D100C8F93F /* avi_decoder.h */, - DF90EABF10B023F300C8F93F /* codecs */, - DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */, - DF895BFD124C24350077F6E8 /* coktel_decoder.h */, - DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */, - DF6118610FE3A9410042AD3F /* dxa_decoder.h */, - DF6118620FE3A9410042AD3F /* flic_decoder.cpp */, - DF6118630FE3A9410042AD3F /* flic_decoder.h */, - DFB0576411B753AF0015AE65 /* qt_decoder.cpp */, - DFB0576511B753AF0015AE65 /* qt_decoder.h */, - DF6118640FE3A9410042AD3F /* smk_decoder.cpp */, - DF6118650FE3A9410042AD3F /* smk_decoder.h */, - DFB0576611B753AF0015AE65 /* video_decoder.cpp */, - DFB0576711B753AF0015AE65 /* video_decoder.h */, + DF203F7B1380C27A0056300A /* codecs */, + DF203F531380C2740056300A /* avi_decoder.cpp */, + DF203F541380C2740056300A /* avi_decoder.h */, + DF203F551380C2740056300A /* coktel_decoder.cpp */, + DF203F561380C2740056300A /* coktel_decoder.h */, + DF203F571380C2740056300A /* dxa_decoder.cpp */, + DF203F581380C2740056300A /* dxa_decoder.h */, + DF203F591380C2740056300A /* flic_decoder.cpp */, + DF203F5A1380C2740056300A /* flic_decoder.h */, + DF203F5D1380C2740056300A /* qt_decoder.cpp */, + DF203F5E1380C2750056300A /* qt_decoder.h */, + DF203F5F1380C2750056300A /* smk_decoder.cpp */, + DF203F601380C2750056300A /* smk_decoder.h */, + DF203F611380C2750056300A /* video_decoder.cpp */, + DF203F621380C2750056300A /* video_decoder.h */, ); - path = video; + name = video; + sourceTree = "<group>"; + }; + DF203F7B1380C27A0056300A /* codecs */ = { + isa = PBXGroup; + children = ( + DF203F7C1380C2920056300A /* cdtoons.cpp */, + DF203F7D1380C2920056300A /* cdtoons.h */, + DF203F7E1380C2920056300A /* cinepak.cpp */, + DF203F7F1380C2920056300A /* cinepak.h */, + DF203F801380C2920056300A /* codec.h */, + DF203F811380C2920056300A /* indeo3.cpp */, + DF203F821380C2920056300A /* indeo3.h */, + DF203F831380C2920056300A /* mjpeg.cpp */, + DF203F841380C2920056300A /* mjpeg.h */, + DF203F851380C2920056300A /* msrle.cpp */, + DF203F861380C2920056300A /* msrle.h */, + DF203F871380C2920056300A /* msvideo1.cpp */, + DF203F881380C2920056300A /* msvideo1.h */, + DF203F8C1380C2920056300A /* qtrle.cpp */, + DF203F8D1380C2920056300A /* qtrle.h */, + DF203F8E1380C2920056300A /* rpza.cpp */, + DF203F8F1380C2920056300A /* rpza.h */, + DF203F901380C2920056300A /* smc.cpp */, + DF203F911380C2920056300A /* smc.h */, + DF203F921380C2920056300A /* truemotion1.cpp */, + DF203F931380C2920056300A /* truemotion1.h */, + DF203F941380C2920056300A /* truemotion1data.h */, + ); + name = codecs; + sourceTree = "<group>"; + }; + DF2040211380C8A60056300A /* widgets */ = { + isa = PBXGroup; + children = ( + DF2040221380C8B70056300A /* editable.cpp */, + DF2040231380C8B70056300A /* editable.h */, + DF2040241380C8B70056300A /* edittext.cpp */, + DF2040251380C8B70056300A /* edittext.h */, + DF2040261380C8B70056300A /* list.cpp */, + DF2040271380C8B70056300A /* list.h */, + DF2040281380C8B70056300A /* popup.cpp */, + DF2040291380C8B70056300A /* popup.h */, + DF20402A1380C8B70056300A /* scrollbar.cpp */, + DF20402B1380C8B70056300A /* scrollbar.h */, + DF20402C1380C8B70056300A /* tab.cpp */, + DF20402D1380C8B70056300A /* tab.h */, + ); + name = widgets; + sourceTree = "<group>"; + }; + DF2040461380C9ED0056300A /* audio */ = { + isa = PBXGroup; + children = ( + F9946D79139E1A260072D195 /* codecs */, + DF46B8991381F6C400D08723 /* null.cpp */, + DF46B89A1381F6C400D08723 /* null.h */, + DF2040E41380CA8C0056300A /* softsynth */, + DF2040BB1380CA5C0056300A /* mods */, + DF2040821380CA280056300A /* decoders */, + DF2040471380CA230056300A /* audiostream.cpp */, + DF2040481380CA230056300A /* audiostream.h */, + DF2040491380CA230056300A /* fmopl.cpp */, + DF20404A1380CA230056300A /* fmopl.h */, + DF20404B1380CA230056300A /* mididrv.cpp */, + DF20404C1380CA230056300A /* mididrv.h */, + DF20404D1380CA230056300A /* midiparser_smf.cpp */, + DF20404E1380CA230056300A /* midiparser_xmidi.cpp */, + DF20404F1380CA230056300A /* midiparser.cpp */, + DF2040501380CA230056300A /* midiparser.h */, + DF2040511380CA230056300A /* midiplayer.cpp */, + DF2040521380CA230056300A /* midiplayer.h */, + DF2040531380CA230056300A /* mixer_intern.h */, + DF2040541380CA230056300A /* mixer.cpp */, + DF2040551380CA230056300A /* mixer.h */, + DF2040561380CA230056300A /* mpu401.cpp */, + DF2040571380CA230056300A /* mpu401.h */, + DF2040581380CA230056300A /* musicplugin.cpp */, + DF2040591380CA230056300A /* musicplugin.h */, + DF20405A1380CA230056300A /* rate.cpp */, + DF20405B1380CA230056300A /* rate.h */, + DF20405C1380CA230056300A /* timestamp.cpp */, + DF20405D1380CA230056300A /* timestamp.h */, + ); + name = audio; + sourceTree = "<group>"; + }; + DF2040821380CA280056300A /* decoders */ = { + isa = PBXGroup; + children = ( + F9946DCE139E1AD30072D195 /* aac.cpp */, + F9946DCF139E1AD30072D195 /* aac.h */, + F9946DD0139E1AD30072D195 /* qdm2.cpp */, + F9946DD1139E1AD30072D195 /* qdm2.h */, + F9946DD2139E1AD30072D195 /* qdm2data.h */, + F9946DD3139E1AD30072D195 /* quicktime_intern.h */, + F9946DD4139E1AD30072D195 /* quicktime.cpp */, + F9946DD5139E1AD30072D195 /* quicktime.h */, + DF2040831380CA400056300A /* adpcm_intern.h */, + DF2040841380CA400056300A /* adpcm.cpp */, + DF2040851380CA400056300A /* adpcm.h */, + DF2040861380CA400056300A /* aiff.cpp */, + DF2040871380CA400056300A /* aiff.h */, + DF2040881380CA400056300A /* flac.cpp */, + DF2040891380CA400056300A /* flac.h */, + DF20408A1380CA400056300A /* iff_sound.cpp */, + DF20408B1380CA400056300A /* iff_sound.h */, + DF20408C1380CA400056300A /* mac_snd.cpp */, + DF20408D1380CA400056300A /* mac_snd.h */, + DF20408E1380CA400056300A /* mp3.cpp */, + DF20408F1380CA400056300A /* mp3.h */, + DF2040901380CA400056300A /* raw.cpp */, + DF2040911380CA400056300A /* raw.h */, + DF2040921380CA400056300A /* vag.cpp */, + DF2040931380CA400056300A /* vag.h */, + DF2040941380CA400056300A /* voc.cpp */, + DF2040951380CA400056300A /* voc.h */, + DF2040961380CA400056300A /* vorbis.cpp */, + DF2040971380CA400056300A /* vorbis.h */, + DF2040981380CA400056300A /* wave.cpp */, + DF2040991380CA400056300A /* wave.h */, + ); + name = decoders; + sourceTree = "<group>"; + }; + DF2040BB1380CA5C0056300A /* mods */ = { + isa = PBXGroup; + children = ( + DF2040BC1380CA810056300A /* infogrames.cpp */, + DF2040BD1380CA810056300A /* infogrames.h */, + DF2040BE1380CA810056300A /* maxtrax.cpp */, + DF2040BF1380CA810056300A /* maxtrax.h */, + DF2040C01380CA810056300A /* module.cpp */, + DF2040C11380CA810056300A /* module.h */, + DF2040C21380CA810056300A /* paula.cpp */, + DF2040C31380CA810056300A /* paula.h */, + DF2040C41380CA810056300A /* protracker.cpp */, + DF2040C51380CA810056300A /* protracker.h */, + DF2040C61380CA810056300A /* rjp1.cpp */, + DF2040C71380CA810056300A /* rjp1.h */, + DF2040C81380CA810056300A /* soundfx.cpp */, + DF2040C91380CA810056300A /* soundfx.h */, + DF2040CA1380CA810056300A /* tfmx.cpp */, + DF2040CB1380CA810056300A /* tfmx.h */, + ); + name = mods; + sourceTree = "<group>"; + }; + DF2040E41380CA8C0056300A /* softsynth */ = { + isa = PBXGroup; + children = ( + F9946DCD139E1A9A0072D195 /* mt32 */, + DF46B8591381F43100D08723 /* opl */, + DF46B6F61381E1D100D08723 /* fmtowns_pc98 */, + DF2040E51380CAA40056300A /* adlib.cpp */, + DF2040E61380CAA40056300A /* appleiigs.cpp */, + DF2040E71380CAA40056300A /* cms.cpp */, + DF2040E81380CAA40056300A /* cms.h */, + DF2040E91380CAA40056300A /* eas.cpp */, + DF2040EA1380CAA40056300A /* emumidi.h */, + DF2040EB1380CAA40056300A /* fluidsynth.cpp */, + DF2040EC1380CAA40056300A /* mt32.cpp */, + DF2040ED1380CAA40056300A /* pcspk.cpp */, + DF2040EE1380CAA40056300A /* pcspk.h */, + DF2040EF1380CAA40056300A /* sid.cpp */, + DF2040F01380CAA40056300A /* sid.h */, + DF2040F11380CAA40056300A /* wave6581.cpp */, + ); + name = softsynth; sourceTree = "<group>"; }; DF2FFBF50F4860A60006E566 /* posix */ = { @@ -5389,6 +5981,8 @@ DF2FFD040F4870E50006E566 /* tucker */ = { isa = PBXGroup; children = ( + DF46B7D41381E7C600D08723 /* console.cpp */, + DF46B7D51381E7C600D08723 /* console.h */, DF2FFD050F4870E50006E566 /* detection.cpp */, DF2FFD060F4870E50006E566 /* graphics.cpp */, DF2FFD070F4870E50006E566 /* graphics.h */, @@ -5403,35 +5997,6 @@ path = tucker; sourceTree = "<group>"; }; - DF45B0EB116627D9009B85CC /* decoders */ = { - isa = PBXGroup; - children = ( - DF45B0F7116627DA009B85CC /* adpcm.cpp */, - DF45B0F8116627DA009B85CC /* adpcm.h */, - DF45B0FA116627DA009B85CC /* aiff.cpp */, - DF45B0FB116627DA009B85CC /* aiff.h */, - DF45B0FD116627DA009B85CC /* flac.cpp */, - DF45B0FE116627DA009B85CC /* flac.h */, - DF45B100116627DA009B85CC /* iff_sound.cpp */, - DF45B101116627DA009B85CC /* iff_sound.h */, - DF7F289E11FF24B000159131 /* mac_snd.cpp */, - DF7F289F11FF24B000159131 /* mac_snd.h */, - DF45B103116627DA009B85CC /* mp3.cpp */, - DF45B104116627DA009B85CC /* mp3.h */, - DF45B106116627DA009B85CC /* raw.cpp */, - DF45B107116627DA009B85CC /* raw.h */, - DF45B109116627DA009B85CC /* vag.cpp */, - DF45B10A116627DA009B85CC /* vag.h */, - DF45B10C116627DA009B85CC /* voc.cpp */, - DF45B10D116627DA009B85CC /* voc.h */, - DF45B10F116627DA009B85CC /* vorbis.cpp */, - DF45B110116627DA009B85CC /* vorbis.h */, - DF45B112116627DA009B85CC /* wave.cpp */, - DF45B113116627DA009B85CC /* wave.h */, - ); - path = decoders; - sourceTree = "<group>"; - }; DF45B175116628A5009B85CC /* graphics */ = { isa = PBXGroup; children = ( @@ -5531,15 +6096,132 @@ DF45B1C5116628A5009B85CC /* video */ = { isa = PBXGroup; children = ( + DF46B7611381E4D400D08723 /* robot_decoder.cpp */, + DF46B7621381E4D400D08723 /* robot_decoder.h */, DF45B1C6116628A5009B85CC /* seq_decoder.cpp */, DF45B1C7116628A5009B85CC /* seq_decoder.h */, ); path = video; sourceTree = "<group>"; }; + DF46B6F61381E1D100D08723 /* fmtowns_pc98 */ = { + isa = PBXGroup; + children = ( + F9946D9A139E1A560072D195 /* towns_midi.cpp */, + F9946D9B139E1A560072D195 /* towns_midi.h */, + F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */, + DF46B6F71381E1FF00D08723 /* towns_audio.cpp */, + DF46B6F81381E1FF00D08723 /* towns_audio.h */, + DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */, + DF46B6FA1381E1FF00D08723 /* towns_euphony.h */, + DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */, + DF46B6FC1381E1FF00D08723 /* towns_pc98_driver.h */, + DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */, + DF46B6FE1381E1FF00D08723 /* towns_pc98_fmsynth.h */, + ); + name = fmtowns_pc98; + sourceTree = "<group>"; + }; + DF46B7411381E3F200D08723 /* log */ = { + isa = PBXGroup; + children = ( + DF46B7421381E40500D08723 /* log.cpp */, + DF46B7431381E40500D08723 /* log.h */, + ); + name = log; + sourceTree = "<group>"; + }; + DF46B7A21381E5CC00D08723 /* sdl */ = { + isa = PBXGroup; + children = ( + DF46B7A31381E5D900D08723 /* sdl-timer.cpp */, + DF46B7A41381E5D900D08723 /* sdl-timer.h */, + ); + name = sdl; + sourceTree = "<group>"; + }; + DF46B7B01381E64E00D08723 /* mutex */ = { + isa = PBXGroup; + children = ( + DF46B7B11381E66000D08723 /* sdl */, + ); + name = mutex; + sourceTree = "<group>"; + }; + DF46B7B11381E66000D08723 /* sdl */ = { + isa = PBXGroup; + children = ( + DF46B7B21381E67800D08723 /* sdl-mutex.cpp */, + DF46B7B31381E67800D08723 /* sdl-mutex.h */, + ); + name = sdl; + sourceTree = "<group>"; + }; + DF46B7CC1381E74D00D08723 /* sdl */ = { + isa = PBXGroup; + children = ( + DF46B7CD1381E76300D08723 /* sdl-events.cpp */, + DF46B7CE1381E76300D08723 /* sdl-events.h */, + ); + name = sdl; + path = ..; + sourceTree = "<group>"; + }; + DF46B8591381F43100D08723 /* opl */ = { + isa = PBXGroup; + children = ( + DF46B85A1381F44E00D08723 /* dbopl.cpp */, + DF46B85B1381F44E00D08723 /* dbopl.h */, + DF46B85C1381F44E00D08723 /* dosbox.cpp */, + DF46B85D1381F44E00D08723 /* dosbox.h */, + DF46B85E1381F44E00D08723 /* mame.cpp */, + DF46B85F1381F44E00D08723 /* mame.h */, + ); + name = opl; + sourceTree = "<group>"; + }; + DF46B86D1381F47B00D08723 /* audiocd */ = { + isa = PBXGroup; + children = ( + DF46B8801381F4FF00D08723 /* audiocd.h */, + DF46B8781381F4C500D08723 /* default */, + DF46B86E1381F48D00D08723 /* sdl */, + ); + name = audiocd; + sourceTree = "<group>"; + }; + DF46B86E1381F48D00D08723 /* sdl */ = { + isa = PBXGroup; + children = ( + DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */, + DF46B8701381F4A200D08723 /* sdl-audiocd.h */, + ); + name = sdl; + sourceTree = "<group>"; + }; + DF46B8781381F4C500D08723 /* default */ = { + isa = PBXGroup; + children = ( + DF46B87B1381F4F200D08723 /* default-audiocd.cpp */, + DF46B87C1381F4F200D08723 /* default-audiocd.h */, + ); + name = default; + sourceTree = "<group>"; + }; + DF46B8861381F5C600D08723 /* sdl */ = { + isa = PBXGroup; + children = ( + DF46B8871381F5D800D08723 /* sdl-provider.cpp */, + DF46B8881381F5D800D08723 /* sdl-provider.h */, + ); + name = sdl; + sourceTree = "<group>"; + }; DF6118780FE3A9AA0042AD3F /* save */ = { isa = PBXGroup; children = ( + DF46B8431381F35500D08723 /* saveload_inca2.cpp */, + DF46B83B1381F13500D08723 /* saveload_v7.cpp */, DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */, DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */, DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */, @@ -5547,7 +6229,6 @@ DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */, DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */, DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */, - DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */, DF61187F0FE3A9AA0042AD3F /* savefile.cpp */, DF6118800FE3A9AA0042AD3F /* savefile.h */, DF6118810FE3A9AA0042AD3F /* savehandler.cpp */, @@ -5565,6 +6246,7 @@ DF841FF50E7BA6A600F5680E /* engines */ = { isa = PBXGroup; children = ( + DF46B8851381F56400D08723 /* util.h */, DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */, DF2FFC4D0F4863560006E566 /* advancedDetector.h */, DF841FF60E7BA6A600F5680E /* agi */, @@ -5747,6 +6429,9 @@ DF8420640E7BA6A600F5680E /* cine */ = { isa = PBXGroup; children = ( + DF46B75B1381E4A400D08723 /* console.cpp */, + DF46B75C1381E4A400D08723 /* console.h */, + DF46B75D1381E4A400D08723 /* detection_tables.h */, DF8420650E7BA6A600F5680E /* anim.cpp */, DF8420660E7BA6A600F5680E /* anim.h */, DF8420670E7BA6A600F5680E /* bg.cpp */, @@ -5882,6 +6567,17 @@ DF8421170E7BA6A700F5680E /* gob */ = { isa = PBXGroup; children = ( + DF46B8471381F38700D08723 /* inter_v7.cpp */, + DF46B70F1381E27000D08723 /* console.cpp */, + DF46B7101381E27000D08723 /* console.h */, + DF46B7111381E27000D08723 /* databases.cpp */, + DF46B7121381E27000D08723 /* databases.h */, + DF46B7131381E27000D08723 /* dbase.cpp */, + DF46B7141381E27000D08723 /* dbase.h */, + DF46B7151381E27000D08723 /* iniconfig.cpp */, + DF46B7161381E27000D08723 /* iniconfig.h */, + DF46B7171381E27000D08723 /* init_v7.cpp */, + DF46B7181381E27000D08723 /* inter_inca2.cpp */, DF84211B0E7BA6A700F5680E /* dataio.cpp */, DF84211C0E7BA6A700F5680E /* dataio.h */, DF09CC060FAC4E1900A5AFD7 /* demos */, @@ -5908,7 +6604,6 @@ DF8421300E7BA6A700F5680E /* goblin_v2.cpp */, DF8421310E7BA6A700F5680E /* goblin_v3.cpp */, DF8421320E7BA6A700F5680E /* goblin_v4.cpp */, - DF6118590FE3A9020042AD3F /* helper.h */, DF7585C5100CB66E00CC3324 /* hotspots.cpp */, DF7585C6100CB66E00CC3324 /* hotspots.h */, DF8421330E7BA6A700F5680E /* init.cpp */, @@ -6255,6 +6950,8 @@ DF8422C90E7BA6A900F5680E /* made */ = { isa = PBXGroup; children = ( + DF46B8501381F3B400D08723 /* console.cpp */, + DF46B8511381F3B400D08723 /* console.h */, DF8422CA0E7BA6A900F5680E /* database.cpp */, DF8422CB0E7BA6A900F5680E /* database.h */, DF8422CC0E7BA6A900F5680E /* detection.cpp */, @@ -6453,6 +7150,10 @@ DF84237B0E7BA6AA00F5680E /* scumm */ = { isa = PBXGroup; children = ( + DF46B7501381E46700D08723 /* actor_he.h */, + DF46B7511381E46700D08723 /* player_v2base.cpp */, + DF46B7521381E46700D08723 /* player_v2base.h */, + DF46B7531381E46700D08723 /* player_v2cms.h */, DF84237C0E7BA6AA00F5680E /* actor.cpp */, DF84237D0E7BA6AA00F5680E /* actor.h */, DF84237E0E7BA6AA00F5680E /* akos.cpp */, @@ -6728,6 +7429,8 @@ DF84244E0E7BA6AB00F5680E /* sword1 */ = { isa = PBXGroup; children = ( + DF46B7C61381E72500D08723 /* console.cpp */, + DF46B7C71381E72500D08723 /* console.h */, DF84244F0E7BA6AB00F5680E /* animation.cpp */, DF8424500E7BA6AB00F5680E /* animation.h */, DF8424510E7BA6AB00F5680E /* collision.h */, @@ -6773,6 +7476,7 @@ DF8424770E7BA6AB00F5680E /* sword2 */ = { isa = PBXGroup; children = ( + DF46B7A81381E5F100D08723 /* header.cpp */, DF8424780E7BA6AB00F5680E /* animation.cpp */, DF8424790E7BA6AB00F5680E /* animation.h */, DF84247A0E7BA6AB00F5680E /* anims.cpp */, @@ -6829,6 +7533,9 @@ DF8424AA0E7BA6AB00F5680E /* tinsel */ = { isa = PBXGroup; children = ( + DF46B8901381F62B00D08723 /* adpcm.cpp */, + DF46B8911381F62B00D08723 /* adpcm.h */, + DF46B6F21381E18900D08723 /* coroutine.cpp */, DF8424AB0E7BA6AB00F5680E /* actors.cpp */, DF8424AC0E7BA6AB00F5680E /* actors.h */, DF8424AD0E7BA6AB00F5680E /* anim.cpp */, @@ -6923,6 +7630,8 @@ DF8424FC0E7BA6AB00F5680E /* touche */ = { isa = PBXGroup; children = ( + DF46B84B1381F39E00D08723 /* console.cpp */, + DF46B84C1381F39E00D08723 /* console.h */, DF8424FD0E7BA6AB00F5680E /* detection.cpp */, DF8424FE0E7BA6AB00F5680E /* graphics.cpp */, DF8424FF0E7BA6AB00F5680E /* graphics.h */, @@ -6939,48 +7648,6 @@ path = touche; sourceTree = "<group>"; }; - DF895C0C124C24C00077F6E8 /* fmtowns_pc98 */ = { - isa = PBXGroup; - children = ( - DF895C0D124C24C00077F6E8 /* towns_audio.cpp */, - DF895C0E124C24C00077F6E8 /* towns_audio.h */, - DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */, - DF895C10124C24C00077F6E8 /* towns_euphony.h */, - DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */, - DF895C12124C24C00077F6E8 /* towns_pc98_driver.h */, - DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */, - DF895C14124C24C00077F6E8 /* towns_pc98_fmsynth.h */, - ); - path = fmtowns_pc98; - sourceTree = "<group>"; - }; - DF90EABF10B023F300C8F93F /* codecs */ = { - isa = PBXGroup; - children = ( - DFB0579611B7549C0015AE65 /* cinepak.cpp */, - DFB0579711B7549C0015AE65 /* cinepak.h */, - DF90EAC010B023F400C8F93F /* codec.h */, - DF895CAB124E58980077F6E8 /* indeo3.cpp */, - DF895CAC124E58980077F6E8 /* indeo3.h */, - DF895CAD124E58980077F6E8 /* mjpeg.cpp */, - DF895CAE124E58980077F6E8 /* mjpeg.h */, - DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */, - DFCDC6FD11662AD700A7D2A0 /* msrle.h */, - DF90EAC110B023F400C8F93F /* msvideo1.cpp */, - DF90EAC210B023F400C8F93F /* msvideo1.h */, - DF895CAF124E58980077F6E8 /* qdm2.cpp */, - DF895CB0124E58980077F6E8 /* qdm2.h */, - DF895CB1124E58980077F6E8 /* qdm2data.h */, - DF895CB2124E58980077F6E8 /* qtrle.cpp */, - DF895CB3124E58980077F6E8 /* qtrle.h */, - DF895CB4124E58980077F6E8 /* rpza.cpp */, - DF895CB5124E58980077F6E8 /* rpza.h */, - DF895CB6124E58980077F6E8 /* smc.cpp */, - DF895CB7124E58980077F6E8 /* smc.h */, - ); - path = codecs; - sourceTree = "<group>"; - }; DF9B9277118E475D0069C19D /* games */ = { isa = PBXGroup; children = ( @@ -7026,6 +7693,9 @@ DFC8301B0F48AF18005EF03C /* engine */ = { isa = PBXGroup; children = ( + DF46B7BB1381E6C000D08723 /* object.cpp */, + DF46B7BC1381E6C000D08723 /* object.h */, + DF46B7661381E4E400D08723 /* vm_types.cpp */, DFCDC6D5116629CE00A7D2A0 /* features.cpp */, DFCDC6D6116629CE00A7D2A0 /* features.h */, DFC8301E0F48AF18005EF03C /* gc.cpp */, @@ -7076,10 +7746,11 @@ DFD5184C0DF3420D00854012 /* scaler */ = { isa = PBXGroup; children = ( + F9946DE9139E1B6F0072D195 /* aspect.h */, + F9946DEA139E1B6F0072D195 /* downscaler.cpp */, + F9946DEB139E1B6F0072D195 /* downscaler.h */, DFD518AA0DF34BA600854012 /* 2xsai.cpp */, DFD518AB0DF34BA600854012 /* aspect.cpp */, - DFD518AD0DF34BA600854012 /* hq2x.cpp */, - DFD518B10DF34BA600854012 /* hq3x.cpp */, DFD5189E0DF34AD700854012 /* intern.h */, DFD518B50DF34BA600854012 /* scale2x.cpp */, DFD518B60DF34BA600854012 /* scale2x.h */, @@ -7121,6 +7792,13 @@ DFE470D50D81F4E700B6D1FB /* backends */ = { isa = PBXGroup; children = ( + F9946E07139E1C3E0072D195 /* graphics */, + F9946DFA139E1BCB0072D195 /* mixer */, + DF46B86D1381F47B00D08723 /* audiocd */, + DF46B7B01381E64E00D08723 /* mutex */, + DF46B7471381E40F00D08723 /* modular-backend.cpp */, + DF46B7481381E40F00D08723 /* modular-backend.h */, + DF46B7411381E3F200D08723 /* log */, DF2FFC5B0F4866E70006E566 /* base-backend.cpp */, DF2FFC5C0F4866E70006E566 /* base-backend.h */, DFE470D60D81F4E700B6D1FB /* events */, @@ -7138,6 +7816,7 @@ DFE470D60D81F4E700B6D1FB /* events */ = { isa = PBXGroup; children = ( + DF46B7CC1381E74D00D08723 /* sdl */, DFE470D70D81F4E700B6D1FB /* default */, ); path = events; @@ -7167,6 +7846,7 @@ DFE470F50D81F4E700B6D1FB /* posix */ = { isa = PBXGroup; children = ( + DFADEBB613820E0C00C46364 /* posix-fs.cpp */, DF842A4C0E7BBBEB00F5680E /* posix-fs.h */, DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */, DFE470F70D81F4E700B6D1FB /* posix-fs-factory.h */, @@ -7188,6 +7868,7 @@ DFE471170D81F4E700B6D1FB /* platform */ = { isa = PBXGroup; children = ( + F92B4DDC139DDC9E000D1BF1 /* macosx */, DF09422F0F63CB9A002D821E /* sdl */, DFE471D70D81F4E700B6D1FB /* iphone */, ); @@ -7217,6 +7898,7 @@ DFE4737B0D81F4E800B6D1FB /* plugins */ = { isa = PBXGroup; children = ( + DF46B8861381F5C600D08723 /* sdl */, DFE4737F0D81F4E800B6D1FB /* dynamic-plugin.h */, DFE473800D81F4E800B6D1FB /* posix */, ); @@ -7254,6 +7936,7 @@ DFE473910D81F4E800B6D1FB /* timer */ = { isa = PBXGroup; children = ( + DF46B7A21381E5CC00D08723 /* sdl */, DFE473920D81F4E800B6D1FB /* default */, ); path = timer; @@ -7271,6 +7954,22 @@ DFE473950D81F4E800B6D1FB /* common */ = { isa = PBXGroup; children = ( + F92B4DCB139DD428000D1BF1 /* memstream.h */, + F92B4DCC139DD428000D1BF1 /* quicktime.cpp */, + F92B4DCD139DD428000D1BF1 /* quicktime.h */, + DF46B76E1381E54200D08723 /* bufferedstream.h */, + DF46B76F1381E54200D08723 /* dcl.cpp */, + DF46B7701381E54200D08723 /* dcl.h */, + DF46B7711381E54200D08723 /* forbidden.h */, + DF46B7721381E54200D08723 /* iff_container.cpp */, + DF46B7731381E54200D08723 /* substream.h */, + DF46B7741381E54200D08723 /* translation.h */, + DF46B7751381E54200D08723 /* winexe_ne.cpp */, + DF46B7761381E54200D08723 /* winexe_ne.h */, + DF46B7771381E54200D08723 /* winexe_pe.cpp */, + DF46B7781381E54200D08723 /* winexe_pe.h */, + DF46B7791381E54200D08723 /* winexe.cpp */, + DF46B77A1381E54200D08723 /* winexe.h */, DFE473980D81F4E800B6D1FB /* algorithm.h */, DF842A400E7BBBB400F5680E /* archive.cpp */, DF842A410E7BBBB400F5680E /* archive.h */, @@ -7357,6 +8056,15 @@ DFE477520D81F4E900B6D1FB /* graphics */ = { isa = PBXGroup; children = ( + F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */, + F92B4DD2139DD449000D1BF1 /* yuv_to_rgb.h */, + DFADEBB113820DF500C46364 /* maccursor.cpp */, + DFADEBB213820DF500C46364 /* maccursor.h */, + DF46B78E1381E58000D08723 /* palette.h */, + DF46B78F1381E58000D08723 /* png.cpp */, + DF46B7901381E58000D08723 /* png.h */, + DF46B7911381E58000D08723 /* wincursor.cpp */, + DF46B7921381E58000D08723 /* wincursor.h */, DFE477530D81F4E900B6D1FB /* colormasks.h */, DF6BF4C010529DA50069811F /* conversion.cpp */, DF6BF4C110529DA50069811F /* conversion.h */, @@ -7393,7 +8101,6 @@ DF7E8C080ED5FCAF001CB19F /* VectorRenderer.h */, DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */, DF7E8C0A0ED5FCAF001CB19F /* VectorRendererSpec.h */, - DF2FFB940F485D950006E566 /* video */, ); name = graphics; path = ../../graphics; @@ -7402,10 +8109,11 @@ DFE4775C0D81F4E900B6D1FB /* fonts */ = { isa = PBXGroup; children = ( + DF46B79D1381E5B500D08723 /* winfont.cpp */, + DF46B79E1381E5B500D08723 /* winfont.h */, DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */, DFE4775E0D81F4E900B6D1FB /* newfont.cpp */, DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */, - DFE477600D81F4E900B6D1FB /* scummfont.cpp */, ); path = fonts; sourceTree = "<group>"; @@ -7413,6 +8121,8 @@ DFE477880D81F4E900B6D1FB /* gui */ = { isa = PBXGroup; children = ( + DF2040211380C8A60056300A /* widgets */, + DF203F461380C06E0056300A /* gui-manager.cpp */, DFE477890D81F4E900B6D1FB /* about.cpp */, DFE4778A0D81F4E900B6D1FB /* about.h */, DFE4778B0D81F4E900B6D1FB /* Actions.cpp */, @@ -7429,20 +8139,13 @@ DFE477950D81F4E900B6D1FB /* debugger.h */, DFE477960D81F4E900B6D1FB /* dialog.cpp */, DFE477970D81F4E900B6D1FB /* dialog.h */, - DFE477980D81F4E900B6D1FB /* editable.cpp */, - DFE477990D81F4E900B6D1FB /* editable.h */, - DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */, - DFE4779B0D81F4E900B6D1FB /* EditTextWidget.h */, DF9B9246118E46730069C19D /* error.cpp */, DF9B9247118E46730069C19D /* error.h */, - DF2FFBD50F485E360006E566 /* gui-manager.hcpp */, DF2FFBD60F485E360006E566 /* gui-manager.h */, DFE4779E0D81F4E900B6D1FB /* Key.cpp */, DFE4779F0D81F4E900B6D1FB /* Key.h */, DFE477A20D81F4E900B6D1FB /* launcher.cpp */, DFE477A30D81F4E900B6D1FB /* launcher.h */, - DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */, - DFE477A50D81F4E900B6D1FB /* ListWidget.h */, DFE477A60D81F4E900B6D1FB /* massadd.cpp */, DFE477A70D81F4E900B6D1FB /* massadd.h */, DFE477A80D81F4E900B6D1FB /* message.cpp */, @@ -7451,14 +8154,8 @@ DFE477AE0D81F4E900B6D1FB /* object.h */, DFE477AF0D81F4E900B6D1FB /* options.cpp */, DFE477B00D81F4E900B6D1FB /* options.h */, - DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */, - DFE477B20D81F4E900B6D1FB /* PopUpWidget.h */, DF7E8BF00ED5FC77001CB19F /* saveload.cpp */, DF7E8BF10ED5FC77001CB19F /* saveload.h */, - DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */, - DFE477B40D81F4E900B6D1FB /* ScrollBarWidget.h */, - DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */, - DFE477B60D81F4E900B6D1FB /* TabWidget.h */, DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */, DFE477BB0D81F4E900B6D1FB /* themebrowser.h */, DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */, @@ -7488,96 +8185,126 @@ path = themes; sourceTree = "<group>"; }; - DFE477C60D81F4E900B6D1FB /* sound */ = { + F92B4DDC139DDC9E000D1BF1 /* macosx */ = { isa = PBXGroup; children = ( - DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */, - DFE477CC0D81F4E900B6D1FB /* audiocd.h */, - DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */, - DFE477CE0D81F4E900B6D1FB /* audiostream.h */, - DF45B0EB116627D9009B85CC /* decoders */, - DFE477D10D81F4E900B6D1FB /* fmopl.cpp */, - DFE477D20D81F4E900B6D1FB /* fmopl.h */, - DFE477D50D81F4E900B6D1FB /* mididrv.cpp */, - DFE477D60D81F4E900B6D1FB /* mididrv.h */, - DFE477D70D81F4E900B6D1FB /* midiparser.cpp */, - DFE477D80D81F4E900B6D1FB /* midiparser.h */, - DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */, - DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */, - DFE477DB0D81F4E900B6D1FB /* mixer.cpp */, - DFE477DC0D81F4E900B6D1FB /* mixer.h */, - DFE477DD0D81F4E900B6D1FB /* mods */, - DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */, - DFE477EE0D81F4E900B6D1FB /* mpu401.h */, - DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */, - DF842A700E7BBDB200F5680E /* musicplugin.h */, - DFE477EF0D81F4E900B6D1FB /* null.cpp */, - DFE477F00D81F4E900B6D1FB /* rate.cpp */, - DFE477F10D81F4E900B6D1FB /* rate.h */, - DFE477F60D81F4E900B6D1FB /* softsynth */, - DF89C2B80F62D91000D756B6 /* timestamp.cpp */, - DF89C2B90F62D91000D756B6 /* timestamp.h */, - ); - name = sound; - path = ../../sound; - sourceTree = SOURCE_ROOT; + F92B4DD7139DDC92000D1BF1 /* macosx-main.cpp */, + F92B4DD8139DDC92000D1BF1 /* macosx.cpp */, + F92B4DD9139DDC92000D1BF1 /* macosx.h */, + ); + name = macosx; + sourceTree = "<group>"; }; - DFE477DD0D81F4E900B6D1FB /* mods */ = { + F9946D79139E1A260072D195 /* codecs */ = { isa = PBXGroup; children = ( - DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */, - DFE477DF0D81F4E900B6D1FB /* infogrames.h */, - DF6BF50210529F540069811F /* maxtrax.cpp */, - DF6BF50310529F540069811F /* maxtrax.h */, - DFE477E00D81F4E900B6D1FB /* module.cpp */, - DFE477E10D81F4E900B6D1FB /* module.h */, - DFE477E20D81F4E900B6D1FB /* paula.cpp */, - DFE477E30D81F4E900B6D1FB /* paula.h */, - DFE477E40D81F4E900B6D1FB /* protracker.cpp */, - DFE477E50D81F4E900B6D1FB /* protracker.h */, - DFE477E60D81F4E900B6D1FB /* rjp1.cpp */, - DFE477E70D81F4E900B6D1FB /* rjp1.h */, - DFE477E80D81F4E900B6D1FB /* soundfx.cpp */, - DFE477E90D81F4E900B6D1FB /* soundfx.h */, - DF6BF50410529F540069811F /* tfmx.cpp */, - DF6BF50510529F540069811F /* tfmx.h */, - ); - path = mods; + F9946D7A139E1A260072D195 /* cdtoons.cpp */, + F9946D7B139E1A260072D195 /* cdtoons.h */, + F9946D7C139E1A260072D195 /* cinepak.cpp */, + F9946D7D139E1A260072D195 /* cinepak.h */, + F9946D7E139E1A260072D195 /* codec.h */, + F9946D7F139E1A260072D195 /* indeo3.cpp */, + F9946D80139E1A260072D195 /* indeo3.h */, + F9946D81139E1A260072D195 /* mjpeg.cpp */, + F9946D82139E1A260072D195 /* mjpeg.h */, + F9946D83139E1A260072D195 /* msrle.cpp */, + F9946D84139E1A260072D195 /* msrle.h */, + F9946D85139E1A260072D195 /* msvideo1.cpp */, + F9946D86139E1A260072D195 /* msvideo1.h */, + F9946D87139E1A260072D195 /* qtrle.cpp */, + F9946D88139E1A260072D195 /* qtrle.h */, + F9946D89139E1A260072D195 /* rpza.cpp */, + F9946D8A139E1A260072D195 /* rpza.h */, + F9946D8B139E1A260072D195 /* smc.cpp */, + F9946D8C139E1A260072D195 /* smc.h */, + F9946D8D139E1A260072D195 /* truemotion1.cpp */, + F9946D8E139E1A260072D195 /* truemotion1.h */, + F9946D8F139E1A260072D195 /* truemotion1data.h */, + ); + name = codecs; + path = ../../video/codecs; sourceTree = "<group>"; }; - DFE477F60D81F4E900B6D1FB /* softsynth */ = { + F9946DCD139E1A9A0072D195 /* mt32 */ = { isa = PBXGroup; children = ( - DFE477F70D81F4E900B6D1FB /* adlib.cpp */, - DF895C08124C24B50077F6E8 /* appleiigs.cpp */, - DF0E303F1252C6090082D593 /* cms.cpp */, - DF0E30401252C6090082D593 /* cms.h */, - DFE477F80D81F4E900B6D1FB /* emumidi.h */, - DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */, - DF895C0C124C24C00077F6E8 /* fmtowns_pc98 */, - DFF958A80FB222F300A3EC78 /* opl */, - DFE478210D81F4E900B6D1FB /* pcspk.cpp */, - DFE478220D81F4E900B6D1FB /* pcspk.h */, - DF2EC51010E64E3100765801 /* sid.cpp */, - DF2EC51110E64E3100765801 /* sid.h */, - DF2EC51710E64EE600765801 /* wave6581.cpp */, - DFE478230D81F4E900B6D1FB /* ym2612.cpp */, - DFE478240D81F4E900B6D1FB /* ym2612.h */, - ); - path = softsynth; + F9946DA3139E1A880072D195 /* freeverb.cpp */, + F9946DA4139E1A880072D195 /* freeverb.h */, + F9946DA5139E1A880072D195 /* i386.cpp */, + F9946DA6139E1A880072D195 /* i386.h */, + F9946DA7139E1A880072D195 /* mt32_file.cpp */, + F9946DA8139E1A880072D195 /* mt32_file.h */, + F9946DA9139E1A880072D195 /* mt32emu.h */, + F9946DAA139E1A880072D195 /* part.cpp */, + F9946DAB139E1A880072D195 /* part.h */, + F9946DAC139E1A880072D195 /* partial.cpp */, + F9946DAD139E1A880072D195 /* partial.h */, + F9946DAE139E1A880072D195 /* partialManager.cpp */, + F9946DAF139E1A880072D195 /* partialManager.h */, + F9946DB0139E1A880072D195 /* structures.h */, + F9946DB1139E1A880072D195 /* synth.cpp */, + F9946DB2139E1A880072D195 /* synth.h */, + F9946DB3139E1A880072D195 /* tables.cpp */, + F9946DB4139E1A880072D195 /* tables.h */, + ); + name = mt32; sourceTree = "<group>"; }; - DFF958A80FB222F300A3EC78 /* opl */ = { + F9946DDF139E1B180072D195 /* posix */ = { isa = PBXGroup; children = ( - DFEC5D3D1166C6B400C90552 /* dbopl.cpp */, - DFEC5D3E1166C6B400C90552 /* dbopl.h */, - DFF958A90FB222F300A3EC78 /* dosbox.cpp */, - DFF958AA0FB222F300A3EC78 /* dosbox.h */, - DF6118CF0FE3AB560042AD3F /* mame.cpp */, - DF6118D00FE3AB560042AD3F /* mame.h */, - ); - path = opl; + F9946DE0139E1B180072D195 /* posix-main.cpp */, + F9946DE1139E1B180072D195 /* posix.cpp */, + F9946DE2139E1B180072D195 /* posix.h */, + ); + path = posix; + sourceTree = "<group>"; + }; + F9946DF4139E1BBF0072D195 /* sdl */ = { + isa = PBXGroup; + children = ( + F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */, + F9946DF6139E1BBF0072D195 /* sdl-mixer.h */, + ); + name = sdl; + path = mixer/sdl; + sourceTree = "<group>"; + }; + F9946DFA139E1BCB0072D195 /* mixer */ = { + isa = PBXGroup; + children = ( + F9946DFB139E1BEB0072D195 /* doublebuffersdl */, + F9946DF4139E1BBF0072D195 /* sdl */, + ); + name = mixer; + sourceTree = "<group>"; + }; + F9946DFB139E1BEB0072D195 /* doublebuffersdl */ = { + isa = PBXGroup; + children = ( + F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */, + F9946DFD139E1BEB0072D195 /* doublebuffersdl-mixer.h */, + ); + name = doublebuffersdl; + path = mixer/doublebuffersdl; + sourceTree = "<group>"; + }; + F9946E01139E1C390072D195 /* sdl */ = { + isa = PBXGroup; + children = ( + F9946E02139E1C390072D195 /* sdl-graphics.cpp */, + F9946E03139E1C390072D195 /* sdl-graphics.h */, + ); + name = sdl; + path = graphics/sdl; + sourceTree = "<group>"; + }; + F9946E07139E1C3E0072D195 /* graphics */ = { + isa = PBXGroup; + children = ( + F9946E01139E1C390072D195 /* sdl */, + ); + name = graphics; sourceTree = "<group>"; }; /* End PBXGroup section */ @@ -7765,7 +8492,6 @@ DFE47BFF0D81F4E900B6D1FB /* consolefont.cpp in Sources */, DFE47C000D81F4E900B6D1FB /* newfont.cpp in Sources */, DFE47C010D81F4E900B6D1FB /* newfont_big.cpp in Sources */, - DFE47C020D81F4E900B6D1FB /* scummfont.cpp in Sources */, DFE47C030D81F4E900B6D1FB /* iff.cpp in Sources */, DFE47C040D81F4E900B6D1FB /* imagedec.cpp in Sources */, DFE47C080D81F4E900B6D1FB /* primitives.cpp in Sources */, @@ -7777,49 +8503,20 @@ DFE47C200D81F4E900B6D1FB /* console.cpp in Sources */, DFE47C210D81F4E900B6D1FB /* debugger.cpp in Sources */, DFE47C220D81F4E900B6D1FB /* dialog.cpp in Sources */, - DFE47C230D81F4E900B6D1FB /* editable.cpp in Sources */, - DFE47C240D81F4E900B6D1FB /* EditTextWidget.cpp in Sources */, DFE47C260D81F4E900B6D1FB /* Key.cpp in Sources */, DFE47C280D81F4E900B6D1FB /* launcher.cpp in Sources */, - DFE47C290D81F4E900B6D1FB /* ListWidget.cpp in Sources */, DFE47C2A0D81F4E900B6D1FB /* massadd.cpp in Sources */, DFE47C2B0D81F4E900B6D1FB /* message.cpp in Sources */, DFE47C2E0D81F4E900B6D1FB /* object.cpp in Sources */, DFE47C2F0D81F4E900B6D1FB /* options.cpp in Sources */, - DFE47C300D81F4E900B6D1FB /* PopUpWidget.cpp in Sources */, - DFE47C310D81F4E900B6D1FB /* ScrollBarWidget.cpp in Sources */, - DFE47C320D81F4E900B6D1FB /* TabWidget.cpp in Sources */, DFE47C350D81F4E900B6D1FB /* themebrowser.cpp in Sources */, DFE47C3B0D81F4E900B6D1FB /* widget.cpp in Sources */, - DFE47C3E0D81F4E900B6D1FB /* audiocd.cpp in Sources */, - DFE47C3F0D81F4E900B6D1FB /* audiostream.cpp in Sources */, - DFE47C410D81F4E900B6D1FB /* fmopl.cpp in Sources */, - DFE47C430D81F4E900B6D1FB /* mididrv.cpp in Sources */, - DFE47C440D81F4E900B6D1FB /* midiparser.cpp in Sources */, - DFE47C450D81F4E900B6D1FB /* midiparser_smf.cpp in Sources */, - DFE47C460D81F4E900B6D1FB /* midiparser_xmidi.cpp in Sources */, - DFE47C470D81F4E900B6D1FB /* mixer.cpp in Sources */, - DFE47C480D81F4E900B6D1FB /* infogrames.cpp in Sources */, - DFE47C490D81F4E900B6D1FB /* module.cpp in Sources */, - DFE47C4A0D81F4E900B6D1FB /* paula.cpp in Sources */, - DFE47C4B0D81F4E900B6D1FB /* protracker.cpp in Sources */, - DFE47C4C0D81F4E900B6D1FB /* rjp1.cpp in Sources */, - DFE47C4D0D81F4E900B6D1FB /* soundfx.cpp in Sources */, - DFE47C500D81F4E900B6D1FB /* mpu401.cpp in Sources */, - DFE47C510D81F4E900B6D1FB /* null.cpp in Sources */, - DFE47C520D81F4E900B6D1FB /* rate.cpp in Sources */, - DFE47C570D81F4E900B6D1FB /* adlib.cpp in Sources */, - DFE47C580D81F4E900B6D1FB /* fluidsynth.cpp in Sources */, - DFE47C740D81F4E900B6D1FB /* pcspk.cpp in Sources */, - DFE47C750D81F4E900B6D1FB /* ym2612.cpp in Sources */, DFD511480DF3383500854012 /* memorypool.cpp in Sources */, DFD517E20DF33CAC00854012 /* seq.cpp in Sources */, DFD5183D0DF3411800854012 /* scaler.cpp in Sources */, DFD518A20DF34B2500854012 /* scalebit.cpp in Sources */, DFD518BC0DF34BA600854012 /* 2xsai.cpp in Sources */, DFD518BD0DF34BA600854012 /* aspect.cpp in Sources */, - DFD518BF0DF34BA600854012 /* hq2x.cpp in Sources */, - DFD518C20DF34BA600854012 /* hq3x.cpp in Sources */, DFD518C50DF34BA600854012 /* scale2x.cpp in Sources */, DFD518C70DF34BA600854012 /* scale3x.cpp in Sources */, DF841FDD0E7BA61800F5680E /* iphone_keyboard.m in Sources */, @@ -8442,7 +9139,6 @@ DF842A470E7BBBB400F5680E /* archive.cpp in Sources */, DF842A490E7BBBB400F5680E /* unarj.cpp in Sources */, DF842A6D0E7BBD5700F5680E /* stdiostream.cpp in Sources */, - DF842A710E7BBDB200F5680E /* musicplugin.cpp in Sources */, DF7E8BFD0ED5FC77001CB19F /* saveload.cpp in Sources */, DF7E8BFF0ED5FC77001CB19F /* ThemeEngine.cpp in Sources */, DF7E8C000ED5FC77001CB19F /* ThemeEval.cpp in Sources */, @@ -8459,7 +9155,6 @@ DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */, DF2FFB930F485D890006E566 /* dither.cpp in Sources */, DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */, - DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */, DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */, DF2FFC290F4862520006E566 /* bmv.cpp in Sources */, DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */, @@ -8531,7 +9226,6 @@ DF573CBE0F5A85E100961A72 /* timer_lol.cpp in Sources */, DF89C2880F62D55C00D756B6 /* sprites_lol.cpp in Sources */, DF89C2A40F62D79E00D756B6 /* script.cpp in Sources */, - DF89C2BB0F62D91000D756B6 /* timestamp.cpp in Sources */, DF093E5F0F63CAD4002D821E /* pn.cpp in Sources */, DF093E600F63CAD4002D821E /* script_pn.cpp in Sources */, DF093E610F63CAD4002D821E /* vga_pn.cpp in Sources */, @@ -8546,20 +9240,15 @@ DF09CC1B0FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */, DF09CC2A0FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */, DF09CC2B0FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */, - DFF958B20FB222F300A3EC78 /* dosbox.cpp in Sources */, DF61183E0FE3A8080042AD3F /* kmisc.cpp in Sources */, DF61183F0FE3A8080042AD3F /* segment.cpp in Sources */, DF61184C0FE3A8250042AD3F /* decompressor.cpp in Sources */, DF61184D0FE3A8250042AD3F /* resource.cpp in Sources */, DF6118560FE3A8990042AD3F /* disk.cpp in Sources */, - DF61186D0FE3A9410042AD3F /* dxa_decoder.cpp in Sources */, - DF61186E0FE3A9410042AD3F /* flic_decoder.cpp in Sources */, - DF61186F0FE3A9410042AD3F /* smk_decoder.cpp in Sources */, DF6118950FE3A9AA0042AD3F /* saveconverter.cpp in Sources */, DF6118960FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */, DF6118970FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */, DF6118980FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */, - DF6118990FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */, DF61189A0FE3A9AA0042AD3F /* savefile.cpp in Sources */, DF61189B0FE3A9AA0042AD3F /* savehandler.cpp in Sources */, DF61189C0FE3A9AA0042AD3F /* saveload.cpp in Sources */, @@ -8573,7 +9262,6 @@ DF6118BE0FE3AA280042AD3F /* sound_pcspk.cpp in Sources */, DF6118BF0FE3AA280042AD3F /* text_lol.cpp in Sources */, DF6118C80FE3AABD0042AD3F /* player_v2cms.cpp in Sources */, - DF6118D30FE3AB560042AD3F /* mame.cpp in Sources */, DF7585DA100CB66E00CC3324 /* expression.cpp in Sources */, DF7585DB100CB66E00CC3324 /* hotspots.cpp in Sources */, DF7585DC100CB66E00CC3324 /* init_v6.cpp in Sources */, @@ -8598,31 +9286,15 @@ DF6BF4F410529EE40069811F /* player_v4a.cpp in Sources */, DF6BF4FE10529F140069811F /* EventDispatcher.cpp in Sources */, DF6BF4FF10529F140069811F /* EventRecorder.cpp in Sources */, - DF6BF50810529F540069811F /* maxtrax.cpp in Sources */, - DF6BF50910529F540069811F /* tfmx.cpp in Sources */, DF90E9C310AEDA9B00C8F93F /* selector.cpp in Sources */, DF90EAA610B0234300C8F93F /* draw_playtoons.cpp in Sources */, DF90EAAF10B0236F00C8F93F /* staticres.cpp in Sources */, - DF90EABA10B023D100C8F93F /* avi_decoder.cpp in Sources */, - DF90EAC510B023F400C8F93F /* msvideo1.cpp in Sources */, DF2EC3F910E64C0C00765801 /* dialogs.cpp in Sources */, DF2EC3FF10E64C4300765801 /* animator_tim.cpp in Sources */, DF2EC40610E64C8000765801 /* event.cpp in Sources */, DF2EC50310E64D7C00765801 /* player_pce.cpp in Sources */, DF2EC50410E64D7C00765801 /* player_sid.cpp in Sources */, DF2EC50C10E64DB300765801 /* textconsole.cpp in Sources */, - DF2EC51310E64E3100765801 /* sid.cpp in Sources */, - DF2EC51910E64EE600765801 /* wave6581.cpp in Sources */, - DF45B11F116627DA009B85CC /* adpcm.cpp in Sources */, - DF45B121116627DA009B85CC /* aiff.cpp in Sources */, - DF45B123116627DA009B85CC /* flac.cpp in Sources */, - DF45B125116627DA009B85CC /* iff_sound.cpp in Sources */, - DF45B127116627DA009B85CC /* mp3.cpp in Sources */, - DF45B129116627DA009B85CC /* raw.cpp in Sources */, - DF45B12B116627DA009B85CC /* vag.cpp in Sources */, - DF45B12D116627DA009B85CC /* voc.cpp in Sources */, - DF45B12F116627DA009B85CC /* vorbis.cpp in Sources */, - DF45B131116627DA009B85CC /* wave.cpp in Sources */, DF45B1CA116628A5009B85CC /* animate.cpp in Sources */, DF45B1CB116628A5009B85CC /* cache.cpp in Sources */, DF45B1CC116628A5009B85CC /* compare.cpp in Sources */, @@ -8656,24 +9328,19 @@ DFCDC6D9116629CE00A7D2A0 /* features.cpp in Sources */, DFCDC6DA116629CE00A7D2A0 /* kparse.cpp in Sources */, DFCDC6F711662AAB00A7D2A0 /* resource.cpp in Sources */, - DFCDC6FE11662AD700A7D2A0 /* msrle.cpp in Sources */, DFCDC70411662B0200A7D2A0 /* saveload_fascin.cpp in Sources */, DFCDC70B11662B6B00A7D2A0 /* macresman.cpp in Sources */, DFEC5D121166C5CF00C90552 /* random.cpp in Sources */, DFEC5D131166C5CF00C90552 /* tokenizer.cpp in Sources */, DFEC5D371166C67300C90552 /* savestate.cpp in Sources */, - DFEC5D401166C6B400C90552 /* dbopl.cpp in Sources */, DF9B9249118E46730069C19D /* error.cpp in Sources */, DF9B9254118E46A00069C19D /* fontsjis.cpp in Sources */, DF9B9263118E46FE0069C19D /* error.cpp in Sources */, - DFB0576C11B753AF0015AE65 /* qt_decoder.cpp in Sources */, - DFB0576D11B753AF0015AE65 /* video_decoder.cpp in Sources */, DFB0577711B753DA0015AE65 /* rational.cpp in Sources */, DFB0578211B7541F0015AE65 /* resource_audio.cpp in Sources */, DFB0578311B7541F0015AE65 /* util.cpp in Sources */, DFB0578B11B754570015AE65 /* maciconbar.cpp in Sources */, DFB0579211B7547D0015AE65 /* pict.cpp in Sources */, - DFB0579911B7549C0015AE65 /* cinepak.cpp in Sources */, DF7F286211FF23D500159131 /* amigamac.cpp in Sources */, DF7F286911FF23EF00159131 /* kvideo.cpp in Sources */, DF7F286A11FF23EF00159131 /* workarounds.cpp in Sources */, @@ -8684,25 +9351,11 @@ DF7F288311FF243B00159131 /* sound_sarien.cpp in Sources */, DF7F288C11FF244F00159131 /* Tooltip.cpp in Sources */, DF7F289511FF247300159131 /* translation.cpp in Sources */, - DF7F28A111FF24B000159131 /* mac_snd.cpp in Sources */, DF7F28A611FF24C400159131 /* console.cpp in Sources */, - DF895BFE124C24350077F6E8 /* coktel_decoder.cpp in Sources */, DF895C03124C24680077F6E8 /* player_towns.cpp in Sources */, - DF895C09124C24B60077F6E8 /* appleiigs.cpp in Sources */, - DF895C15124C24C10077F6E8 /* towns_audio.cpp in Sources */, - DF895C16124C24C10077F6E8 /* towns_euphony.cpp in Sources */, - DF895C17124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */, - DF895C18124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */, DF895C25124C25150077F6E8 /* init_fascin.cpp in Sources */, DF895C2A124C25350077F6E8 /* script_patches.cpp in Sources */, - DF895CB8124E58980077F6E8 /* indeo3.cpp in Sources */, - DF895CB9124E58980077F6E8 /* mjpeg.cpp in Sources */, - DF895CBA124E58980077F6E8 /* qdm2.cpp in Sources */, - DF895CBB124E58980077F6E8 /* qtrle.cpp in Sources */, - DF895CBC124E58980077F6E8 /* rpza.cpp in Sources */, - DF895CBD124E58990077F6E8 /* smc.cpp in Sources */, DF0E303B1252C5BD0082D593 /* cms.cpp in Sources */, - DF0E30421252C6090082D593 /* cms.cpp in Sources */, 8CB5A9CB1253FD6900CB6BC7 /* m4_scene.cpp in Sources */, 8CB5A9CC1253FD6900CB6BC7 /* mads_logic.cpp in Sources */, 8CB5A9CD1253FD6900CB6BC7 /* mads_player.cpp in Sources */, @@ -8710,7 +9363,6 @@ 8CB5A9CF1253FD6900CB6BC7 /* mads_views.cpp in Sources */, 8CD1ED53126202AB00FA198C /* detection.cpp in Sources */, 8CD1ED54126202AB00FA198C /* display.cpp in Sources */, - 8CD1ED55126202AB00FA198C /* engine.cpp in Sources */, 8CD1ED56126202AB00FA198C /* file.cpp in Sources */, 8CD1ED57126202AB00FA198C /* hugo.cpp in Sources */, 8CD1ED58126202AB00FA198C /* intro.cpp in Sources */, @@ -8759,6 +9411,164 @@ 8CD80D13126272A0001C6C87 /* surface.cpp in Sources */, 8CD80D14126272A0001C6C87 /* surface_list.cpp in Sources */, 8CD80D15126272A0001C6C87 /* teenagent.cpp in Sources */, + DF203F481380C06E0056300A /* gui-manager.cpp in Sources */, + DF203F6B1380C2750056300A /* avi_decoder.cpp in Sources */, + DF203F6C1380C2750056300A /* coktel_decoder.cpp in Sources */, + DF203F6D1380C2750056300A /* dxa_decoder.cpp in Sources */, + DF203F6E1380C2750056300A /* flic_decoder.cpp in Sources */, + DF203F701380C2750056300A /* qt_decoder.cpp in Sources */, + DF203F711380C2750056300A /* smk_decoder.cpp in Sources */, + DF203F721380C2750056300A /* video_decoder.cpp in Sources */, + DF203FA01380C2920056300A /* cdtoons.cpp in Sources */, + DF203FA11380C2920056300A /* cinepak.cpp in Sources */, + DF203FA21380C2920056300A /* indeo3.cpp in Sources */, + DF203FA31380C2920056300A /* mjpeg.cpp in Sources */, + DF203FA41380C2920056300A /* msrle.cpp in Sources */, + DF203FA51380C2920056300A /* msvideo1.cpp in Sources */, + DF203FA71380C2920056300A /* qtrle.cpp in Sources */, + DF203FA81380C2920056300A /* rpza.cpp in Sources */, + DF203FA91380C2920056300A /* smc.cpp in Sources */, + DF203FAA1380C2920056300A /* truemotion1.cpp in Sources */, + DF203FE61380C3BC0056300A /* console.cpp in Sources */, + DF203FE71380C3BC0056300A /* dialogs.cpp in Sources */, + DF203FE81380C3BC0056300A /* file_v1d.cpp in Sources */, + DF203FE91380C3BC0056300A /* file_v1w.cpp in Sources */, + DF203FEA1380C3BC0056300A /* file_v2d.cpp in Sources */, + DF203FEB1380C3BC0056300A /* file_v2w.cpp in Sources */, + DF203FEC1380C3BC0056300A /* file_v3d.cpp in Sources */, + DF203FED1380C3BC0056300A /* object_v1d.cpp in Sources */, + DF203FEE1380C3BC0056300A /* object_v1w.cpp in Sources */, + DF203FEF1380C3BC0056300A /* object_v2d.cpp in Sources */, + DF203FF01380C3BC0056300A /* object_v3d.cpp in Sources */, + DF203FF11380C3BC0056300A /* object.cpp in Sources */, + DF203FF21380C3BC0056300A /* parser_v1d.cpp in Sources */, + DF203FF31380C3BC0056300A /* parser_v1w.cpp in Sources */, + DF203FF41380C3BC0056300A /* parser_v2d.cpp in Sources */, + DF203FF51380C3BC0056300A /* parser_v3d.cpp in Sources */, + DF203FF61380C3BC0056300A /* text.cpp in Sources */, + DF2040341380C8B70056300A /* editable.cpp in Sources */, + DF2040351380C8B70056300A /* edittext.cpp in Sources */, + DF2040361380C8B70056300A /* list.cpp in Sources */, + DF2040371380C8B70056300A /* popup.cpp in Sources */, + DF2040381380C8B70056300A /* scrollbar.cpp in Sources */, + DF2040391380C8B70056300A /* tab.cpp in Sources */, + DF20406A1380CA230056300A /* audiostream.cpp in Sources */, + DF20406B1380CA230056300A /* fmopl.cpp in Sources */, + DF20406C1380CA230056300A /* mididrv.cpp in Sources */, + DF20406D1380CA230056300A /* midiparser_smf.cpp in Sources */, + DF20406E1380CA230056300A /* midiparser_xmidi.cpp in Sources */, + DF20406F1380CA230056300A /* midiparser.cpp in Sources */, + DF2040701380CA230056300A /* midiplayer.cpp in Sources */, + DF2040711380CA230056300A /* mixer.cpp in Sources */, + DF2040721380CA230056300A /* mpu401.cpp in Sources */, + DF2040731380CA230056300A /* musicplugin.cpp in Sources */, + DF2040741380CA230056300A /* rate.cpp in Sources */, + DF2040751380CA230056300A /* timestamp.cpp in Sources */, + DF2040A51380CA400056300A /* adpcm.cpp in Sources */, + DF2040A61380CA400056300A /* aiff.cpp in Sources */, + DF2040A71380CA400056300A /* flac.cpp in Sources */, + DF2040A81380CA400056300A /* iff_sound.cpp in Sources */, + DF2040A91380CA400056300A /* mac_snd.cpp in Sources */, + DF2040AA1380CA400056300A /* mp3.cpp in Sources */, + DF2040AB1380CA400056300A /* raw.cpp in Sources */, + DF2040AC1380CA400056300A /* vag.cpp in Sources */, + DF2040AD1380CA400056300A /* voc.cpp in Sources */, + DF2040AE1380CA400056300A /* vorbis.cpp in Sources */, + DF2040AF1380CA400056300A /* wave.cpp in Sources */, + DF2040D41380CA810056300A /* infogrames.cpp in Sources */, + DF2040D51380CA810056300A /* maxtrax.cpp in Sources */, + DF2040D61380CA810056300A /* module.cpp in Sources */, + DF2040D71380CA810056300A /* paula.cpp in Sources */, + DF2040D81380CA810056300A /* protracker.cpp in Sources */, + DF2040D91380CA810056300A /* rjp1.cpp in Sources */, + DF2040DA1380CA810056300A /* soundfx.cpp in Sources */, + DF2040DB1380CA810056300A /* tfmx.cpp in Sources */, + DF2040FE1380CAA40056300A /* adlib.cpp in Sources */, + DF2040FF1380CAA40056300A /* appleiigs.cpp in Sources */, + DF2041001380CAA40056300A /* cms.cpp in Sources */, + DF2041011380CAA40056300A /* eas.cpp in Sources */, + DF2041021380CAA40056300A /* fluidsynth.cpp in Sources */, + DF2041031380CAA40056300A /* mt32.cpp in Sources */, + DF2041041380CAA40056300A /* pcspk.cpp in Sources */, + DF2041051380CAA40056300A /* sid.cpp in Sources */, + DF2041061380CAA40056300A /* wave6581.cpp in Sources */, + DF46B6F41381E18900D08723 /* coroutine.cpp in Sources */, + DF46B7031381E1FF00D08723 /* towns_audio.cpp in Sources */, + DF46B7041381E1FF00D08723 /* towns_euphony.cpp in Sources */, + DF46B7051381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */, + DF46B7061381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */, + DF46B71F1381E27000D08723 /* console.cpp in Sources */, + DF46B7201381E27000D08723 /* databases.cpp in Sources */, + DF46B7211381E27000D08723 /* dbase.cpp in Sources */, + DF46B7221381E27000D08723 /* iniconfig.cpp in Sources */, + DF46B7231381E27000D08723 /* init_v7.cpp in Sources */, + DF46B7241381E27000D08723 /* inter_inca2.cpp in Sources */, + DF46B7451381E40500D08723 /* log.cpp in Sources */, + DF46B74A1381E40F00D08723 /* modular-backend.cpp in Sources */, + DF46B7551381E46700D08723 /* player_v2base.cpp in Sources */, + DF46B75F1381E4A400D08723 /* console.cpp in Sources */, + DF46B7641381E4D400D08723 /* robot_decoder.cpp in Sources */, + DF46B7681381E4E400D08723 /* vm_types.cpp in Sources */, + DF46B7801381E54200D08723 /* dcl.cpp in Sources */, + DF46B7811381E54200D08723 /* iff_container.cpp in Sources */, + DF46B7821381E54200D08723 /* winexe_ne.cpp in Sources */, + DF46B7831381E54200D08723 /* winexe_pe.cpp in Sources */, + DF46B7841381E54200D08723 /* winexe.cpp in Sources */, + DF46B7951381E58000D08723 /* png.cpp in Sources */, + DF46B7961381E58000D08723 /* wincursor.cpp in Sources */, + DF46B7A01381E5B500D08723 /* winfont.cpp in Sources */, + DF46B7AA1381E5F100D08723 /* header.cpp in Sources */, + DF46B7B51381E67800D08723 /* sdl-mutex.cpp in Sources */, + DF46B7BE1381E6C000D08723 /* object.cpp in Sources */, + DF46B7C91381E72500D08723 /* console.cpp in Sources */, + DF46B7D71381E7C600D08723 /* console.cpp in Sources */, + DF46B83D1381F13500D08723 /* saveload_v7.cpp in Sources */, + DF46B8451381F35500D08723 /* saveload_inca2.cpp in Sources */, + DF46B8491381F38700D08723 /* inter_v7.cpp in Sources */, + DF46B84E1381F39E00D08723 /* console.cpp in Sources */, + DF46B8531381F3B400D08723 /* console.cpp in Sources */, + DF46B8631381F44E00D08723 /* dbopl.cpp in Sources */, + DF46B8641381F44E00D08723 /* dosbox.cpp in Sources */, + DF46B8651381F44E00D08723 /* mame.cpp in Sources */, + DF46B8721381F4A200D08723 /* sdl-audiocd.cpp in Sources */, + DF46B87E1381F4F200D08723 /* default-audiocd.cpp in Sources */, + DF46B88A1381F5D800D08723 /* sdl-provider.cpp in Sources */, + DF46B8931381F62B00D08723 /* adpcm.cpp in Sources */, + DF46B89C1381F6C400D08723 /* null.cpp in Sources */, + DFADEBB413820DF500C46364 /* maccursor.cpp in Sources */, + DFADEBB813820E0C00C46364 /* posix-fs.cpp in Sources */, + F92B4DCE139DD428000D1BF1 /* quicktime.cpp in Sources */, + F92B4DD3139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */, + F9946D90139E1A260072D195 /* cdtoons.cpp in Sources */, + F9946D91139E1A260072D195 /* cinepak.cpp in Sources */, + F9946D92139E1A260072D195 /* indeo3.cpp in Sources */, + F9946D93139E1A260072D195 /* mjpeg.cpp in Sources */, + F9946D94139E1A260072D195 /* msrle.cpp in Sources */, + F9946D95139E1A260072D195 /* msvideo1.cpp in Sources */, + F9946D96139E1A260072D195 /* qtrle.cpp in Sources */, + F9946D97139E1A260072D195 /* rpza.cpp in Sources */, + F9946D98139E1A260072D195 /* smc.cpp in Sources */, + F9946D99139E1A260072D195 /* truemotion1.cpp in Sources */, + F9946D9D139E1A560072D195 /* towns_midi.cpp in Sources */, + F9946DA0139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */, + F9946DB5139E1A880072D195 /* freeverb.cpp in Sources */, + F9946DB8139E1A880072D195 /* i386.cpp in Sources */, + F9946DBB139E1A880072D195 /* mt32_file.cpp in Sources */, + F9946DBE139E1A880072D195 /* part.cpp in Sources */, + F9946DC1139E1A880072D195 /* partial.cpp in Sources */, + F9946DC4139E1A880072D195 /* partialManager.cpp in Sources */, + F9946DC7139E1A880072D195 /* synth.cpp in Sources */, + F9946DCA139E1A880072D195 /* tables.cpp in Sources */, + F9946DD6139E1AD30072D195 /* aac.cpp in Sources */, + F9946DD9139E1AD30072D195 /* qdm2.cpp in Sources */, + F9946DDC139E1AD30072D195 /* quicktime.cpp in Sources */, + F9946DE3139E1B180072D195 /* posix-main.cpp in Sources */, + F9946DE6139E1B180072D195 /* posix.cpp in Sources */, + F9946DEC139E1B6F0072D195 /* downscaler.cpp in Sources */, + F9946DF1139E1BA00072D195 /* console.cpp in Sources */, + F9946DF7139E1BBF0072D195 /* sdl-mixer.cpp in Sources */, + F9946DFE139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */, + F9946E04139E1C390072D195 /* sdl-graphics.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8794,7 +9604,6 @@ DF093E9C0F63CB26002D821E /* consolefont.cpp in Sources */, DF093E9D0F63CB26002D821E /* newfont.cpp in Sources */, DF093E9E0F63CB26002D821E /* newfont_big.cpp in Sources */, - DF093E9F0F63CB26002D821E /* scummfont.cpp in Sources */, DF093EA00F63CB26002D821E /* iff.cpp in Sources */, DF093EA10F63CB26002D821E /* imagedec.cpp in Sources */, DF093EA20F63CB26002D821E /* primitives.cpp in Sources */, @@ -8805,49 +9614,20 @@ DF093EA80F63CB26002D821E /* console.cpp in Sources */, DF093EA90F63CB26002D821E /* debugger.cpp in Sources */, DF093EAA0F63CB26002D821E /* dialog.cpp in Sources */, - DF093EAB0F63CB26002D821E /* editable.cpp in Sources */, - DF093EAC0F63CB26002D821E /* EditTextWidget.cpp in Sources */, DF093EAD0F63CB26002D821E /* Key.cpp in Sources */, DF093EAE0F63CB26002D821E /* launcher.cpp in Sources */, - DF093EAF0F63CB26002D821E /* ListWidget.cpp in Sources */, DF093EB00F63CB26002D821E /* massadd.cpp in Sources */, DF093EB10F63CB26002D821E /* message.cpp in Sources */, DF093EB20F63CB26002D821E /* object.cpp in Sources */, DF093EB30F63CB26002D821E /* options.cpp in Sources */, - DF093EB40F63CB26002D821E /* PopUpWidget.cpp in Sources */, - DF093EB50F63CB26002D821E /* ScrollBarWidget.cpp in Sources */, - DF093EB60F63CB26002D821E /* TabWidget.cpp in Sources */, DF093EB70F63CB26002D821E /* themebrowser.cpp in Sources */, DF093EB80F63CB26002D821E /* widget.cpp in Sources */, - DF093EBB0F63CB26002D821E /* audiocd.cpp in Sources */, - DF093EBC0F63CB26002D821E /* audiostream.cpp in Sources */, - DF093EBE0F63CB26002D821E /* fmopl.cpp in Sources */, - DF093EC00F63CB26002D821E /* mididrv.cpp in Sources */, - DF093EC10F63CB26002D821E /* midiparser.cpp in Sources */, - DF093EC20F63CB26002D821E /* midiparser_smf.cpp in Sources */, - DF093EC30F63CB26002D821E /* midiparser_xmidi.cpp in Sources */, - DF093EC40F63CB26002D821E /* mixer.cpp in Sources */, - DF093EC50F63CB26002D821E /* infogrames.cpp in Sources */, - DF093EC60F63CB26002D821E /* module.cpp in Sources */, - DF093EC70F63CB26002D821E /* paula.cpp in Sources */, - DF093EC80F63CB26002D821E /* protracker.cpp in Sources */, - DF093EC90F63CB26002D821E /* rjp1.cpp in Sources */, - DF093ECA0F63CB26002D821E /* soundfx.cpp in Sources */, - DF093ECC0F63CB26002D821E /* mpu401.cpp in Sources */, - DF093ECD0F63CB26002D821E /* null.cpp in Sources */, - DF093ECE0F63CB26002D821E /* rate.cpp in Sources */, - DF093ECF0F63CB26002D821E /* adlib.cpp in Sources */, - DF093ED00F63CB26002D821E /* fluidsynth.cpp in Sources */, - DF093ED10F63CB26002D821E /* pcspk.cpp in Sources */, - DF093ED20F63CB26002D821E /* ym2612.cpp in Sources */, DF093ED60F63CB26002D821E /* memorypool.cpp in Sources */, DF093ED70F63CB26002D821E /* seq.cpp in Sources */, DF093ED80F63CB26002D821E /* scaler.cpp in Sources */, DF093ED90F63CB26002D821E /* scalebit.cpp in Sources */, DF093EDA0F63CB26002D821E /* 2xsai.cpp in Sources */, DF093EDB0F63CB26002D821E /* aspect.cpp in Sources */, - DF093EDC0F63CB26002D821E /* hq2x.cpp in Sources */, - DF093EDD0F63CB26002D821E /* hq3x.cpp in Sources */, DF093EDE0F63CB26002D821E /* scale2x.cpp in Sources */, DF093EDF0F63CB26002D821E /* scale3x.cpp in Sources */, DF093EE20F63CB26002D821E /* agi.cpp in Sources */, @@ -9467,7 +10247,6 @@ DF09417A0F63CB26002D821E /* archive.cpp in Sources */, DF09417B0F63CB26002D821E /* unarj.cpp in Sources */, DF09417C0F63CB26002D821E /* stdiostream.cpp in Sources */, - DF09417D0F63CB26002D821E /* musicplugin.cpp in Sources */, DF09417E0F63CB26002D821E /* saveload.cpp in Sources */, DF09417F0F63CB26002D821E /* ThemeEngine.cpp in Sources */, DF0941800F63CB26002D821E /* ThemeEval.cpp in Sources */, @@ -9484,7 +10263,6 @@ DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */, DF09418C0F63CB26002D821E /* dither.cpp in Sources */, DF0941920F63CB26002D821E /* debug.cpp in Sources */, - DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */, DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */, DF0941950F63CB26002D821E /* bmv.cpp in Sources */, DF0941960F63CB26002D821E /* dialogs.cpp in Sources */, @@ -9556,12 +10334,9 @@ DF09420D0F63CB26002D821E /* timer_lol.cpp in Sources */, DF0942100F63CB26002D821E /* sprites_lol.cpp in Sources */, DF0942110F63CB26002D821E /* script.cpp in Sources */, - DF0942140F63CB26002D821E /* timestamp.cpp in Sources */, DF0942150F63CB26002D821E /* pn.cpp in Sources */, DF0942160F63CB26002D821E /* script_pn.cpp in Sources */, DF0942170F63CB26002D821E /* vga_pn.cpp in Sources */, - DF0942430F63CB9A002D821E /* events.cpp in Sources */, - DF0942450F63CB9A002D821E /* graphics.cpp in Sources */, DF0942470F63CB9A002D821E /* main.cpp in Sources */, DF09424A0F63CB9A002D821E /* sdl.cpp in Sources */, DF0944330F63FBB3002D821E /* coreaudio.cpp in Sources */, @@ -9577,20 +10352,15 @@ DF09CC150FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */, DF09CC280FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */, DF09CC290FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */, - DFF958AF0FB222F300A3EC78 /* dosbox.cpp in Sources */, DF61183C0FE3A8080042AD3F /* kmisc.cpp in Sources */, DF61183D0FE3A8080042AD3F /* segment.cpp in Sources */, DF6118490FE3A8250042AD3F /* decompressor.cpp in Sources */, DF61184A0FE3A8250042AD3F /* resource.cpp in Sources */, DF6118550FE3A8990042AD3F /* disk.cpp in Sources */, - DF6118680FE3A9410042AD3F /* dxa_decoder.cpp in Sources */, - DF6118690FE3A9410042AD3F /* flic_decoder.cpp in Sources */, - DF61186A0FE3A9410042AD3F /* smk_decoder.cpp in Sources */, DF6118890FE3A9AA0042AD3F /* saveconverter.cpp in Sources */, DF61188A0FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */, DF61188B0FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */, DF61188C0FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */, - DF61188D0FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */, DF61188E0FE3A9AA0042AD3F /* savefile.cpp in Sources */, DF61188F0FE3A9AA0042AD3F /* savehandler.cpp in Sources */, DF6118900FE3A9AA0042AD3F /* saveload.cpp in Sources */, @@ -9605,7 +10375,6 @@ DF6118BB0FE3AA280042AD3F /* text_lol.cpp in Sources */, DF6118C70FE3AABD0042AD3F /* player_v2cms.cpp in Sources */, DF6118CC0FE3AAFD0042AD3F /* hardwarekeys.cpp in Sources */, - DF6118D10FE3AB560042AD3F /* mame.cpp in Sources */, DF7585CE100CB66E00CC3324 /* expression.cpp in Sources */, DF7585CF100CB66E00CC3324 /* hotspots.cpp in Sources */, DF7585D0100CB66E00CC3324 /* init_v6.cpp in Sources */, @@ -9626,13 +10395,9 @@ DF6BF4F510529EE40069811F /* player_v4a.cpp in Sources */, DF6BF50010529F140069811F /* EventDispatcher.cpp in Sources */, DF6BF50110529F140069811F /* EventRecorder.cpp in Sources */, - DF6BF50A10529F540069811F /* maxtrax.cpp in Sources */, - DF6BF50B10529F540069811F /* tfmx.cpp in Sources */, DF90E9BF10AEDA9B00C8F93F /* selector.cpp in Sources */, DF90EAA410B0234300C8F93F /* draw_playtoons.cpp in Sources */, DF90EAAD10B0236F00C8F93F /* staticres.cpp in Sources */, - DF90EAB810B023D100C8F93F /* avi_decoder.cpp in Sources */, - DF90EAC310B023F400C8F93F /* msvideo1.cpp in Sources */, DF2EC3E510E6490800765801 /* browser_osx.mm in Sources */, DF2EC3F810E64C0C00765801 /* dialogs.cpp in Sources */, DF2EC3FE10E64C4300765801 /* animator_tim.cpp in Sources */, @@ -9640,18 +10405,6 @@ DF2EC50110E64D7C00765801 /* player_pce.cpp in Sources */, DF2EC50210E64D7C00765801 /* player_sid.cpp in Sources */, DF2EC50B10E64DB300765801 /* textconsole.cpp in Sources */, - DF2EC51210E64E3100765801 /* sid.cpp in Sources */, - DF2EC51810E64EE600765801 /* wave6581.cpp in Sources */, - DF45B13D116627DA009B85CC /* adpcm.cpp in Sources */, - DF45B13F116627DA009B85CC /* aiff.cpp in Sources */, - DF45B141116627DA009B85CC /* flac.cpp in Sources */, - DF45B143116627DA009B85CC /* iff_sound.cpp in Sources */, - DF45B145116627DA009B85CC /* mp3.cpp in Sources */, - DF45B147116627DA009B85CC /* raw.cpp in Sources */, - DF45B149116627DA009B85CC /* vag.cpp in Sources */, - DF45B14B116627DA009B85CC /* voc.cpp in Sources */, - DF45B14D116627DA009B85CC /* vorbis.cpp in Sources */, - DF45B14F116627DA009B85CC /* wave.cpp in Sources */, DF45B1F4116628A5009B85CC /* animate.cpp in Sources */, DF45B1F5116628A5009B85CC /* cache.cpp in Sources */, DF45B1F6116628A5009B85CC /* compare.cpp in Sources */, @@ -9685,24 +10438,19 @@ DFCDC6DB116629CE00A7D2A0 /* features.cpp in Sources */, DFCDC6DC116629CE00A7D2A0 /* kparse.cpp in Sources */, DFCDC6F811662AAB00A7D2A0 /* resource.cpp in Sources */, - DFCDC6FF11662AD700A7D2A0 /* msrle.cpp in Sources */, DFCDC70511662B0200A7D2A0 /* saveload_fascin.cpp in Sources */, DFCDC70C11662B6B00A7D2A0 /* macresman.cpp in Sources */, DFEC5D141166C5CF00C90552 /* random.cpp in Sources */, DFEC5D151166C5CF00C90552 /* tokenizer.cpp in Sources */, DFEC5D381166C67300C90552 /* savestate.cpp in Sources */, - DFEC5D411166C6B400C90552 /* dbopl.cpp in Sources */, DF9B924A118E46730069C19D /* error.cpp in Sources */, DF9B9256118E46A00069C19D /* fontsjis.cpp in Sources */, DF9B9264118E46FE0069C19D /* error.cpp in Sources */, - DFB0576F11B753AF0015AE65 /* qt_decoder.cpp in Sources */, - DFB0577011B753AF0015AE65 /* video_decoder.cpp in Sources */, DFB0577811B753DA0015AE65 /* rational.cpp in Sources */, DFB0578411B7541F0015AE65 /* resource_audio.cpp in Sources */, DFB0578511B7541F0015AE65 /* util.cpp in Sources */, DFB0578C11B754570015AE65 /* maciconbar.cpp in Sources */, DFB0579311B7547D0015AE65 /* pict.cpp in Sources */, - DFB0579A11B7549C0015AE65 /* cinepak.cpp in Sources */, DF7F286311FF23D500159131 /* amigamac.cpp in Sources */, DF7F286B11FF23EF00159131 /* kvideo.cpp in Sources */, DF7F286C11FF23EF00159131 /* workarounds.cpp in Sources */, @@ -9713,25 +10461,11 @@ DF7F288811FF243B00159131 /* sound_sarien.cpp in Sources */, DF7F288D11FF244F00159131 /* Tooltip.cpp in Sources */, DF7F289711FF247300159131 /* translation.cpp in Sources */, - DF7F28A211FF24B000159131 /* mac_snd.cpp in Sources */, DF7F28A711FF24C400159131 /* console.cpp in Sources */, - DF895BFF124C24350077F6E8 /* coktel_decoder.cpp in Sources */, DF895C04124C24680077F6E8 /* player_towns.cpp in Sources */, - DF895C0A124C24B60077F6E8 /* appleiigs.cpp in Sources */, - DF895C19124C24C10077F6E8 /* towns_audio.cpp in Sources */, - DF895C1A124C24C10077F6E8 /* towns_euphony.cpp in Sources */, - DF895C1B124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */, - DF895C1C124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */, DF895C26124C25150077F6E8 /* init_fascin.cpp in Sources */, DF895C2B124C25350077F6E8 /* script_patches.cpp in Sources */, - DF895CBE124E58990077F6E8 /* indeo3.cpp in Sources */, - DF895CBF124E58990077F6E8 /* mjpeg.cpp in Sources */, - DF895CC0124E58990077F6E8 /* qdm2.cpp in Sources */, - DF895CC1124E58990077F6E8 /* qtrle.cpp in Sources */, - DF895CC2124E58990077F6E8 /* rpza.cpp in Sources */, - DF895CC3124E58990077F6E8 /* smc.cpp in Sources */, DF0E303C1252C5BD0082D593 /* cms.cpp in Sources */, - DF0E30431252C6090082D593 /* cms.cpp in Sources */, 8CB5A9C61253FD6900CB6BC7 /* m4_scene.cpp in Sources */, 8CB5A9C71253FD6900CB6BC7 /* mads_logic.cpp in Sources */, 8CB5A9C81253FD6900CB6BC7 /* mads_player.cpp in Sources */, @@ -9739,7 +10473,6 @@ 8CB5A9CA1253FD6900CB6BC7 /* mads_views.cpp in Sources */, 8CD1ED2F126202AB00FA198C /* detection.cpp in Sources */, 8CD1ED30126202AB00FA198C /* display.cpp in Sources */, - 8CD1ED31126202AB00FA198C /* engine.cpp in Sources */, 8CD1ED32126202AB00FA198C /* file.cpp in Sources */, 8CD1ED33126202AB00FA198C /* hugo.cpp in Sources */, 8CD1ED34126202AB00FA198C /* intro.cpp in Sources */, @@ -9788,6 +10521,158 @@ 8CD80D01126272A0001C6C87 /* surface.cpp in Sources */, 8CD80D02126272A0001C6C87 /* surface_list.cpp in Sources */, 8CD80D03126272A0001C6C87 /* teenagent.cpp in Sources */, + DF203F471380C06E0056300A /* gui-manager.cpp in Sources */, + DF203F631380C2750056300A /* avi_decoder.cpp in Sources */, + DF203F641380C2750056300A /* coktel_decoder.cpp in Sources */, + DF203F651380C2750056300A /* dxa_decoder.cpp in Sources */, + DF203F661380C2750056300A /* flic_decoder.cpp in Sources */, + DF203F681380C2750056300A /* qt_decoder.cpp in Sources */, + DF203F691380C2750056300A /* smk_decoder.cpp in Sources */, + DF203F6A1380C2750056300A /* video_decoder.cpp in Sources */, + DF203F951380C2920056300A /* cdtoons.cpp in Sources */, + DF203F961380C2920056300A /* cinepak.cpp in Sources */, + DF203F971380C2920056300A /* indeo3.cpp in Sources */, + DF203F981380C2920056300A /* mjpeg.cpp in Sources */, + DF203F991380C2920056300A /* msrle.cpp in Sources */, + DF203F9A1380C2920056300A /* msvideo1.cpp in Sources */, + DF203F9C1380C2920056300A /* qtrle.cpp in Sources */, + DF203F9D1380C2920056300A /* rpza.cpp in Sources */, + DF203F9E1380C2920056300A /* smc.cpp in Sources */, + DF203F9F1380C2920056300A /* truemotion1.cpp in Sources */, + DF203FD51380C3BC0056300A /* console.cpp in Sources */, + DF203FD61380C3BC0056300A /* dialogs.cpp in Sources */, + DF203FD71380C3BC0056300A /* file_v1d.cpp in Sources */, + DF203FD81380C3BC0056300A /* file_v1w.cpp in Sources */, + DF203FD91380C3BC0056300A /* file_v2d.cpp in Sources */, + DF203FDA1380C3BC0056300A /* file_v2w.cpp in Sources */, + DF203FDB1380C3BC0056300A /* file_v3d.cpp in Sources */, + DF203FDC1380C3BC0056300A /* object_v1d.cpp in Sources */, + DF203FDD1380C3BC0056300A /* object_v1w.cpp in Sources */, + DF203FDE1380C3BC0056300A /* object_v2d.cpp in Sources */, + DF203FDF1380C3BC0056300A /* object_v3d.cpp in Sources */, + DF203FE01380C3BC0056300A /* object.cpp in Sources */, + DF203FE11380C3BC0056300A /* parser_v1d.cpp in Sources */, + DF203FE21380C3BC0056300A /* parser_v1w.cpp in Sources */, + DF203FE31380C3BC0056300A /* parser_v2d.cpp in Sources */, + DF203FE41380C3BC0056300A /* parser_v3d.cpp in Sources */, + DF203FE51380C3BC0056300A /* text.cpp in Sources */, + DF20402E1380C8B70056300A /* editable.cpp in Sources */, + DF20402F1380C8B70056300A /* edittext.cpp in Sources */, + DF2040301380C8B70056300A /* list.cpp in Sources */, + DF2040311380C8B70056300A /* popup.cpp in Sources */, + DF2040321380C8B70056300A /* scrollbar.cpp in Sources */, + DF2040331380C8B70056300A /* tab.cpp in Sources */, + DF20405E1380CA230056300A /* audiostream.cpp in Sources */, + DF20405F1380CA230056300A /* fmopl.cpp in Sources */, + DF2040601380CA230056300A /* mididrv.cpp in Sources */, + DF2040611380CA230056300A /* midiparser_smf.cpp in Sources */, + DF2040621380CA230056300A /* midiparser_xmidi.cpp in Sources */, + DF2040631380CA230056300A /* midiparser.cpp in Sources */, + DF2040641380CA230056300A /* midiplayer.cpp in Sources */, + DF2040651380CA230056300A /* mixer.cpp in Sources */, + DF2040661380CA230056300A /* mpu401.cpp in Sources */, + DF2040671380CA230056300A /* musicplugin.cpp in Sources */, + DF2040681380CA230056300A /* rate.cpp in Sources */, + DF2040691380CA230056300A /* timestamp.cpp in Sources */, + DF20409A1380CA400056300A /* adpcm.cpp in Sources */, + DF20409B1380CA400056300A /* aiff.cpp in Sources */, + DF20409C1380CA400056300A /* flac.cpp in Sources */, + DF20409D1380CA400056300A /* iff_sound.cpp in Sources */, + DF20409E1380CA400056300A /* mac_snd.cpp in Sources */, + DF20409F1380CA400056300A /* mp3.cpp in Sources */, + DF2040A01380CA400056300A /* raw.cpp in Sources */, + DF2040A11380CA400056300A /* vag.cpp in Sources */, + DF2040A21380CA400056300A /* voc.cpp in Sources */, + DF2040A31380CA400056300A /* vorbis.cpp in Sources */, + DF2040A41380CA400056300A /* wave.cpp in Sources */, + DF2040CC1380CA810056300A /* infogrames.cpp in Sources */, + DF2040CD1380CA810056300A /* maxtrax.cpp in Sources */, + DF2040CE1380CA810056300A /* module.cpp in Sources */, + DF2040CF1380CA810056300A /* paula.cpp in Sources */, + DF2040D01380CA810056300A /* protracker.cpp in Sources */, + DF2040D11380CA810056300A /* rjp1.cpp in Sources */, + DF2040D21380CA810056300A /* soundfx.cpp in Sources */, + DF2040D31380CA810056300A /* tfmx.cpp in Sources */, + DF2040F41380CAA40056300A /* adlib.cpp in Sources */, + DF2040F51380CAA40056300A /* appleiigs.cpp in Sources */, + DF2040F61380CAA40056300A /* cms.cpp in Sources */, + DF2040F71380CAA40056300A /* eas.cpp in Sources */, + DF2040F81380CAA40056300A /* fluidsynth.cpp in Sources */, + DF2040F91380CAA40056300A /* mt32.cpp in Sources */, + DF2040FA1380CAA40056300A /* pcspk.cpp in Sources */, + DF2040FB1380CAA40056300A /* sid.cpp in Sources */, + DF2040FC1380CAA40056300A /* wave6581.cpp in Sources */, + DF46B6F31381E18900D08723 /* coroutine.cpp in Sources */, + DF46B6FF1381E1FF00D08723 /* towns_audio.cpp in Sources */, + DF46B7001381E1FF00D08723 /* towns_euphony.cpp in Sources */, + DF46B7011381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */, + DF46B7021381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */, + DF46B7191381E27000D08723 /* console.cpp in Sources */, + DF46B71A1381E27000D08723 /* databases.cpp in Sources */, + DF46B71B1381E27000D08723 /* dbase.cpp in Sources */, + DF46B71C1381E27000D08723 /* iniconfig.cpp in Sources */, + DF46B71D1381E27000D08723 /* init_v7.cpp in Sources */, + DF46B71E1381E27000D08723 /* inter_inca2.cpp in Sources */, + DF46B7441381E40500D08723 /* log.cpp in Sources */, + DF46B7491381E40F00D08723 /* modular-backend.cpp in Sources */, + DF46B7541381E46700D08723 /* player_v2base.cpp in Sources */, + DF46B75E1381E4A400D08723 /* console.cpp in Sources */, + DF46B7631381E4D400D08723 /* robot_decoder.cpp in Sources */, + DF46B7671381E4E400D08723 /* vm_types.cpp in Sources */, + DF46B77B1381E54200D08723 /* dcl.cpp in Sources */, + DF46B77C1381E54200D08723 /* iff_container.cpp in Sources */, + DF46B77D1381E54200D08723 /* winexe_ne.cpp in Sources */, + DF46B77E1381E54200D08723 /* winexe_pe.cpp in Sources */, + DF46B77F1381E54200D08723 /* winexe.cpp in Sources */, + DF46B7931381E58000D08723 /* png.cpp in Sources */, + DF46B7941381E58000D08723 /* wincursor.cpp in Sources */, + DF46B79F1381E5B500D08723 /* winfont.cpp in Sources */, + DF46B7A51381E5D900D08723 /* sdl-timer.cpp in Sources */, + DF46B7A91381E5F100D08723 /* header.cpp in Sources */, + DF46B7B41381E67800D08723 /* sdl-mutex.cpp in Sources */, + DF46B7BD1381E6C000D08723 /* object.cpp in Sources */, + DF46B7C81381E72500D08723 /* console.cpp in Sources */, + DF46B7CF1381E76300D08723 /* sdl-events.cpp in Sources */, + DF46B7D61381E7C600D08723 /* console.cpp in Sources */, + DF46B83C1381F13500D08723 /* saveload_v7.cpp in Sources */, + DF46B8441381F35500D08723 /* saveload_inca2.cpp in Sources */, + DF46B8481381F38700D08723 /* inter_v7.cpp in Sources */, + DF46B84D1381F39E00D08723 /* console.cpp in Sources */, + DF46B8521381F3B400D08723 /* console.cpp in Sources */, + DF46B8601381F44E00D08723 /* dbopl.cpp in Sources */, + DF46B8611381F44E00D08723 /* dosbox.cpp in Sources */, + DF46B8621381F44E00D08723 /* mame.cpp in Sources */, + DF46B8711381F4A200D08723 /* sdl-audiocd.cpp in Sources */, + DF46B87D1381F4F200D08723 /* default-audiocd.cpp in Sources */, + DF46B8891381F5D800D08723 /* sdl-provider.cpp in Sources */, + DF46B8921381F62B00D08723 /* adpcm.cpp in Sources */, + DF46B89B1381F6C400D08723 /* null.cpp in Sources */, + DFADEBB313820DF500C46364 /* maccursor.cpp in Sources */, + DFADEBB713820E0C00C46364 /* posix-fs.cpp in Sources */, + F92B4DCF139DD428000D1BF1 /* quicktime.cpp in Sources */, + F92B4DD4139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */, + F92B4DDA139DDC92000D1BF1 /* macosx-main.cpp in Sources */, + F92B4DDB139DDC92000D1BF1 /* macosx.cpp in Sources */, + F9946D9E139E1A560072D195 /* towns_midi.cpp in Sources */, + F9946DA1139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */, + F9946DB6139E1A880072D195 /* freeverb.cpp in Sources */, + F9946DB9139E1A880072D195 /* i386.cpp in Sources */, + F9946DBC139E1A880072D195 /* mt32_file.cpp in Sources */, + F9946DBF139E1A880072D195 /* part.cpp in Sources */, + F9946DC2139E1A880072D195 /* partial.cpp in Sources */, + F9946DC5139E1A880072D195 /* partialManager.cpp in Sources */, + F9946DC8139E1A880072D195 /* synth.cpp in Sources */, + F9946DCB139E1A880072D195 /* tables.cpp in Sources */, + F9946DD7139E1AD30072D195 /* aac.cpp in Sources */, + F9946DDA139E1AD30072D195 /* qdm2.cpp in Sources */, + F9946DDD139E1AD30072D195 /* quicktime.cpp in Sources */, + F9946DE4139E1B180072D195 /* posix-main.cpp in Sources */, + F9946DE7139E1B180072D195 /* posix.cpp in Sources */, + F9946DED139E1B6F0072D195 /* downscaler.cpp in Sources */, + F9946DF2139E1BA00072D195 /* console.cpp in Sources */, + F9946DF8139E1BBF0072D195 /* sdl-mixer.cpp in Sources */, + F9946DFF139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */, + F9946E05139E1C390072D195 /* sdl-graphics.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -9824,7 +10709,6 @@ DFF959320FB22D5700A3EC78 /* consolefont.cpp in Sources */, DFF959330FB22D5700A3EC78 /* newfont.cpp in Sources */, DFF959340FB22D5700A3EC78 /* newfont_big.cpp in Sources */, - DFF959350FB22D5700A3EC78 /* scummfont.cpp in Sources */, DFF959360FB22D5700A3EC78 /* iff.cpp in Sources */, DFF959370FB22D5700A3EC78 /* imagedec.cpp in Sources */, DFF959380FB22D5700A3EC78 /* primitives.cpp in Sources */, @@ -9836,49 +10720,20 @@ DFF9593E0FB22D5700A3EC78 /* console.cpp in Sources */, DFF9593F0FB22D5700A3EC78 /* debugger.cpp in Sources */, DFF959400FB22D5700A3EC78 /* dialog.cpp in Sources */, - DFF959410FB22D5700A3EC78 /* editable.cpp in Sources */, - DFF959420FB22D5700A3EC78 /* EditTextWidget.cpp in Sources */, DFF959430FB22D5700A3EC78 /* Key.cpp in Sources */, DFF959440FB22D5700A3EC78 /* launcher.cpp in Sources */, - DFF959450FB22D5700A3EC78 /* ListWidget.cpp in Sources */, DFF959460FB22D5700A3EC78 /* massadd.cpp in Sources */, DFF959470FB22D5700A3EC78 /* message.cpp in Sources */, DFF959480FB22D5700A3EC78 /* object.cpp in Sources */, DFF959490FB22D5700A3EC78 /* options.cpp in Sources */, - DFF9594A0FB22D5700A3EC78 /* PopUpWidget.cpp in Sources */, - DFF9594B0FB22D5700A3EC78 /* ScrollBarWidget.cpp in Sources */, - DFF9594C0FB22D5700A3EC78 /* TabWidget.cpp in Sources */, DFF9594D0FB22D5700A3EC78 /* themebrowser.cpp in Sources */, DFF9594E0FB22D5700A3EC78 /* widget.cpp in Sources */, - DFF959510FB22D5700A3EC78 /* audiocd.cpp in Sources */, - DFF959520FB22D5700A3EC78 /* audiostream.cpp in Sources */, - DFF959540FB22D5700A3EC78 /* fmopl.cpp in Sources */, - DFF959560FB22D5700A3EC78 /* mididrv.cpp in Sources */, - DFF959570FB22D5700A3EC78 /* midiparser.cpp in Sources */, - DFF959580FB22D5700A3EC78 /* midiparser_smf.cpp in Sources */, - DFF959590FB22D5700A3EC78 /* midiparser_xmidi.cpp in Sources */, - DFF9595A0FB22D5700A3EC78 /* mixer.cpp in Sources */, - DFF9595B0FB22D5700A3EC78 /* infogrames.cpp in Sources */, - DFF9595C0FB22D5700A3EC78 /* module.cpp in Sources */, - DFF9595D0FB22D5700A3EC78 /* paula.cpp in Sources */, - DFF9595E0FB22D5700A3EC78 /* protracker.cpp in Sources */, - DFF9595F0FB22D5700A3EC78 /* rjp1.cpp in Sources */, - DFF959600FB22D5700A3EC78 /* soundfx.cpp in Sources */, - DFF959620FB22D5700A3EC78 /* mpu401.cpp in Sources */, - DFF959630FB22D5700A3EC78 /* null.cpp in Sources */, - DFF959640FB22D5700A3EC78 /* rate.cpp in Sources */, - DFF959650FB22D5700A3EC78 /* adlib.cpp in Sources */, - DFF959660FB22D5700A3EC78 /* fluidsynth.cpp in Sources */, - DFF959670FB22D5700A3EC78 /* pcspk.cpp in Sources */, - DFF959680FB22D5700A3EC78 /* ym2612.cpp in Sources */, DFF9596C0FB22D5700A3EC78 /* memorypool.cpp in Sources */, DFF9596D0FB22D5700A3EC78 /* seq.cpp in Sources */, DFF9596E0FB22D5700A3EC78 /* scaler.cpp in Sources */, DFF9596F0FB22D5700A3EC78 /* scalebit.cpp in Sources */, DFF959700FB22D5700A3EC78 /* 2xsai.cpp in Sources */, DFF959710FB22D5700A3EC78 /* aspect.cpp in Sources */, - DFF959720FB22D5700A3EC78 /* hq2x.cpp in Sources */, - DFF959730FB22D5700A3EC78 /* hq3x.cpp in Sources */, DFF959740FB22D5700A3EC78 /* scale2x.cpp in Sources */, DFF959750FB22D5700A3EC78 /* scale3x.cpp in Sources */, DFF959760FB22D5700A3EC78 /* iphone_keyboard.m in Sources */, @@ -10501,7 +11356,6 @@ DFF95C0F0FB22D5700A3EC78 /* archive.cpp in Sources */, DFF95C100FB22D5700A3EC78 /* unarj.cpp in Sources */, DFF95C110FB22D5700A3EC78 /* stdiostream.cpp in Sources */, - DFF95C120FB22D5700A3EC78 /* musicplugin.cpp in Sources */, DFF95C130FB22D5700A3EC78 /* saveload.cpp in Sources */, DFF95C140FB22D5700A3EC78 /* ThemeEngine.cpp in Sources */, DFF95C150FB22D5700A3EC78 /* ThemeEval.cpp in Sources */, @@ -10518,7 +11372,6 @@ DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */, DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */, DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */, - DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */, DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */, DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */, DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */, @@ -10590,7 +11443,6 @@ DFF95C920FB22D5700A3EC78 /* timer_lol.cpp in Sources */, DFF95C940FB22D5700A3EC78 /* sprites_lol.cpp in Sources */, DFF95C950FB22D5700A3EC78 /* script.cpp in Sources */, - DFF95C980FB22D5700A3EC78 /* timestamp.cpp in Sources */, DFF95C990FB22D5700A3EC78 /* pn.cpp in Sources */, DFF95C9A0FB22D5700A3EC78 /* script_pn.cpp in Sources */, DFF95C9B0FB22D5700A3EC78 /* vga_pn.cpp in Sources */, @@ -10605,20 +11457,15 @@ DFF95CB30FB22D5700A3EC78 /* inter_fascin.cpp in Sources */, DFF95CB40FB22D5700A3EC78 /* script_v3.cpp in Sources */, DFF95CB50FB22D5700A3EC78 /* script_v4.cpp in Sources */, - DFF95CB70FB22D5700A3EC78 /* dosbox.cpp in Sources */, DF6118400FE3A8080042AD3F /* kmisc.cpp in Sources */, DF6118410FE3A8080042AD3F /* segment.cpp in Sources */, DF61184F0FE3A8250042AD3F /* decompressor.cpp in Sources */, DF6118500FE3A8250042AD3F /* resource.cpp in Sources */, DF6118570FE3A8990042AD3F /* disk.cpp in Sources */, - DF6118720FE3A9410042AD3F /* dxa_decoder.cpp in Sources */, - DF6118730FE3A9410042AD3F /* flic_decoder.cpp in Sources */, - DF6118740FE3A9410042AD3F /* smk_decoder.cpp in Sources */, DF6118A10FE3A9AA0042AD3F /* saveconverter.cpp in Sources */, DF6118A20FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */, DF6118A30FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */, DF6118A40FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */, - DF6118A50FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */, DF6118A60FE3A9AA0042AD3F /* savefile.cpp in Sources */, DF6118A70FE3A9AA0042AD3F /* savehandler.cpp in Sources */, DF6118A80FE3A9AA0042AD3F /* saveload.cpp in Sources */, @@ -10632,7 +11479,6 @@ DF6118C20FE3AA280042AD3F /* sound_pcspk.cpp in Sources */, DF6118C30FE3AA280042AD3F /* text_lol.cpp in Sources */, DF6118C90FE3AABD0042AD3F /* player_v2cms.cpp in Sources */, - DF6118D20FE3AB560042AD3F /* mame.cpp in Sources */, DF7585D4100CB66E00CC3324 /* expression.cpp in Sources */, DF7585D5100CB66E00CC3324 /* hotspots.cpp in Sources */, DF7585D6100CB66E00CC3324 /* init_v6.cpp in Sources */, @@ -10657,31 +11503,15 @@ DF6BF4F310529EE40069811F /* player_v4a.cpp in Sources */, DF6BF4FC10529F140069811F /* EventDispatcher.cpp in Sources */, DF6BF4FD10529F140069811F /* EventRecorder.cpp in Sources */, - DF6BF50610529F540069811F /* maxtrax.cpp in Sources */, - DF6BF50710529F540069811F /* tfmx.cpp in Sources */, DF90E9C110AEDA9B00C8F93F /* selector.cpp in Sources */, DF90EAA510B0234300C8F93F /* draw_playtoons.cpp in Sources */, DF90EAAE10B0236F00C8F93F /* staticres.cpp in Sources */, - DF90EAB910B023D100C8F93F /* avi_decoder.cpp in Sources */, - DF90EAC410B023F400C8F93F /* msvideo1.cpp in Sources */, DF2EC3FA10E64C0C00765801 /* dialogs.cpp in Sources */, DF2EC40010E64C4300765801 /* animator_tim.cpp in Sources */, DF2EC40710E64C8000765801 /* event.cpp in Sources */, DF2EC50510E64D7C00765801 /* player_pce.cpp in Sources */, DF2EC50610E64D7C00765801 /* player_sid.cpp in Sources */, DF2EC50D10E64DB300765801 /* textconsole.cpp in Sources */, - DF2EC51410E64E3100765801 /* sid.cpp in Sources */, - DF2EC51A10E64EE600765801 /* wave6581.cpp in Sources */, - DF45B15B116627DA009B85CC /* adpcm.cpp in Sources */, - DF45B15D116627DA009B85CC /* aiff.cpp in Sources */, - DF45B15F116627DA009B85CC /* flac.cpp in Sources */, - DF45B161116627DA009B85CC /* iff_sound.cpp in Sources */, - DF45B163116627DA009B85CC /* mp3.cpp in Sources */, - DF45B165116627DA009B85CC /* raw.cpp in Sources */, - DF45B167116627DA009B85CC /* vag.cpp in Sources */, - DF45B169116627DA009B85CC /* voc.cpp in Sources */, - DF45B16B116627DA009B85CC /* vorbis.cpp in Sources */, - DF45B16D116627DA009B85CC /* wave.cpp in Sources */, DF45B21E116628A5009B85CC /* animate.cpp in Sources */, DF45B21F116628A5009B85CC /* cache.cpp in Sources */, DF45B220116628A5009B85CC /* compare.cpp in Sources */, @@ -10715,24 +11545,19 @@ DFCDC6DD116629CE00A7D2A0 /* features.cpp in Sources */, DFCDC6DE116629CE00A7D2A0 /* kparse.cpp in Sources */, DFCDC6F911662AAB00A7D2A0 /* resource.cpp in Sources */, - DFCDC70011662AD700A7D2A0 /* msrle.cpp in Sources */, DFCDC70611662B0200A7D2A0 /* saveload_fascin.cpp in Sources */, DFCDC70D11662B6B00A7D2A0 /* macresman.cpp in Sources */, DFEC5D101166C5CF00C90552 /* random.cpp in Sources */, DFEC5D111166C5CF00C90552 /* tokenizer.cpp in Sources */, DFEC5D361166C67300C90552 /* savestate.cpp in Sources */, - DFEC5D3F1166C6B400C90552 /* dbopl.cpp in Sources */, DF9B9248118E46730069C19D /* error.cpp in Sources */, DF9B9252118E46A00069C19D /* fontsjis.cpp in Sources */, DF9B9262118E46FE0069C19D /* error.cpp in Sources */, - DFB0576911B753AF0015AE65 /* qt_decoder.cpp in Sources */, - DFB0576A11B753AF0015AE65 /* video_decoder.cpp in Sources */, DFB0577611B753DA0015AE65 /* rational.cpp in Sources */, DFB0578011B7541F0015AE65 /* resource_audio.cpp in Sources */, DFB0578111B7541F0015AE65 /* util.cpp in Sources */, DFB0578A11B754570015AE65 /* maciconbar.cpp in Sources */, DFB0579111B7547D0015AE65 /* pict.cpp in Sources */, - DFB0579811B7549C0015AE65 /* cinepak.cpp in Sources */, DF7F286111FF23D500159131 /* amigamac.cpp in Sources */, DF7F286711FF23EF00159131 /* kvideo.cpp in Sources */, DF7F286811FF23EF00159131 /* workarounds.cpp in Sources */, @@ -10743,25 +11568,11 @@ DF7F287E11FF243B00159131 /* sound_sarien.cpp in Sources */, DF7F288B11FF244F00159131 /* Tooltip.cpp in Sources */, DF7F289311FF247300159131 /* translation.cpp in Sources */, - DF7F28A011FF24B000159131 /* mac_snd.cpp in Sources */, DF7F28A511FF24C400159131 /* console.cpp in Sources */, - DF895C00124C24350077F6E8 /* coktel_decoder.cpp in Sources */, DF895C05124C24680077F6E8 /* player_towns.cpp in Sources */, - DF895C0B124C24B60077F6E8 /* appleiigs.cpp in Sources */, - DF895C1D124C24C10077F6E8 /* towns_audio.cpp in Sources */, - DF895C1E124C24C10077F6E8 /* towns_euphony.cpp in Sources */, - DF895C1F124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */, - DF895C20124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */, DF895C27124C25150077F6E8 /* init_fascin.cpp in Sources */, DF895C2C124C25350077F6E8 /* script_patches.cpp in Sources */, - DF895CC4124E58990077F6E8 /* indeo3.cpp in Sources */, - DF895CC5124E58990077F6E8 /* mjpeg.cpp in Sources */, - DF895CC6124E58990077F6E8 /* qdm2.cpp in Sources */, - DF895CC7124E58990077F6E8 /* qtrle.cpp in Sources */, - DF895CC8124E58990077F6E8 /* rpza.cpp in Sources */, - DF895CC9124E58990077F6E8 /* smc.cpp in Sources */, DF0E303A1252C5BD0082D593 /* cms.cpp in Sources */, - DF0E30411252C6090082D593 /* cms.cpp in Sources */, 8CB5A9C11253FD6900CB6BC7 /* m4_scene.cpp in Sources */, 8CB5A9C21253FD6900CB6BC7 /* mads_logic.cpp in Sources */, 8CB5A9C31253FD6900CB6BC7 /* mads_player.cpp in Sources */, @@ -10769,7 +11580,6 @@ 8CB5A9C51253FD6900CB6BC7 /* mads_views.cpp in Sources */, 8CD1ED0B126202AB00FA198C /* detection.cpp in Sources */, 8CD1ED0C126202AB00FA198C /* display.cpp in Sources */, - 8CD1ED0D126202AB00FA198C /* engine.cpp in Sources */, 8CD1ED0E126202AB00FA198C /* file.cpp in Sources */, 8CD1ED0F126202AB00FA198C /* hugo.cpp in Sources */, 8CD1ED10126202AB00FA198C /* intro.cpp in Sources */, @@ -10818,6 +11628,154 @@ 8CD80CEF126272A0001C6C87 /* surface.cpp in Sources */, 8CD80CF0126272A0001C6C87 /* surface_list.cpp in Sources */, 8CD80CF1126272A0001C6C87 /* teenagent.cpp in Sources */, + DF203F491380C06E0056300A /* gui-manager.cpp in Sources */, + DF203F731380C2750056300A /* avi_decoder.cpp in Sources */, + DF203F741380C2750056300A /* coktel_decoder.cpp in Sources */, + DF203F751380C2750056300A /* dxa_decoder.cpp in Sources */, + DF203F761380C2750056300A /* flic_decoder.cpp in Sources */, + DF203F781380C2750056300A /* qt_decoder.cpp in Sources */, + DF203F791380C2750056300A /* smk_decoder.cpp in Sources */, + DF203F7A1380C2750056300A /* video_decoder.cpp in Sources */, + DF203FAB1380C2920056300A /* cdtoons.cpp in Sources */, + DF203FAC1380C2920056300A /* cinepak.cpp in Sources */, + DF203FAD1380C2920056300A /* indeo3.cpp in Sources */, + DF203FAE1380C2920056300A /* mjpeg.cpp in Sources */, + DF203FAF1380C2920056300A /* msrle.cpp in Sources */, + DF203FB01380C2920056300A /* msvideo1.cpp in Sources */, + DF203FB21380C2920056300A /* qtrle.cpp in Sources */, + DF203FB31380C2920056300A /* rpza.cpp in Sources */, + DF203FB41380C2920056300A /* smc.cpp in Sources */, + DF203FB51380C2920056300A /* truemotion1.cpp in Sources */, + DF203FF71380C3BC0056300A /* console.cpp in Sources */, + DF203FF81380C3BC0056300A /* dialogs.cpp in Sources */, + DF203FF91380C3BC0056300A /* file_v1d.cpp in Sources */, + DF203FFA1380C3BC0056300A /* file_v1w.cpp in Sources */, + DF203FFB1380C3BC0056300A /* file_v2d.cpp in Sources */, + DF203FFC1380C3BC0056300A /* file_v2w.cpp in Sources */, + DF203FFD1380C3BC0056300A /* file_v3d.cpp in Sources */, + DF203FFE1380C3BC0056300A /* object_v1d.cpp in Sources */, + DF203FFF1380C3BC0056300A /* object_v1w.cpp in Sources */, + DF2040001380C3BC0056300A /* object_v2d.cpp in Sources */, + DF2040011380C3BC0056300A /* object_v3d.cpp in Sources */, + DF2040021380C3BC0056300A /* object.cpp in Sources */, + DF2040031380C3BC0056300A /* parser_v1d.cpp in Sources */, + DF2040041380C3BC0056300A /* parser_v1w.cpp in Sources */, + DF2040051380C3BC0056300A /* parser_v2d.cpp in Sources */, + DF2040061380C3BC0056300A /* parser_v3d.cpp in Sources */, + DF2040071380C3BC0056300A /* text.cpp in Sources */, + DF20403A1380C8B70056300A /* editable.cpp in Sources */, + DF20403B1380C8B70056300A /* edittext.cpp in Sources */, + DF20403C1380C8B70056300A /* list.cpp in Sources */, + DF20403D1380C8B70056300A /* popup.cpp in Sources */, + DF20403E1380C8B70056300A /* scrollbar.cpp in Sources */, + DF20403F1380C8B70056300A /* tab.cpp in Sources */, + DF2040761380CA230056300A /* audiostream.cpp in Sources */, + DF2040771380CA230056300A /* fmopl.cpp in Sources */, + DF2040781380CA230056300A /* mididrv.cpp in Sources */, + DF2040791380CA230056300A /* midiparser_smf.cpp in Sources */, + DF20407A1380CA230056300A /* midiparser_xmidi.cpp in Sources */, + DF20407B1380CA230056300A /* midiparser.cpp in Sources */, + DF20407C1380CA230056300A /* midiplayer.cpp in Sources */, + DF20407D1380CA230056300A /* mixer.cpp in Sources */, + DF20407E1380CA230056300A /* mpu401.cpp in Sources */, + DF20407F1380CA230056300A /* musicplugin.cpp in Sources */, + DF2040801380CA230056300A /* rate.cpp in Sources */, + DF2040811380CA230056300A /* timestamp.cpp in Sources */, + DF2040B01380CA400056300A /* adpcm.cpp in Sources */, + DF2040B11380CA400056300A /* aiff.cpp in Sources */, + DF2040B21380CA400056300A /* flac.cpp in Sources */, + DF2040B31380CA400056300A /* iff_sound.cpp in Sources */, + DF2040B41380CA400056300A /* mac_snd.cpp in Sources */, + DF2040B51380CA400056300A /* mp3.cpp in Sources */, + DF2040B61380CA400056300A /* raw.cpp in Sources */, + DF2040B71380CA400056300A /* vag.cpp in Sources */, + DF2040B81380CA400056300A /* voc.cpp in Sources */, + DF2040B91380CA400056300A /* vorbis.cpp in Sources */, + DF2040BA1380CA400056300A /* wave.cpp in Sources */, + DF2040DC1380CA810056300A /* infogrames.cpp in Sources */, + DF2040DD1380CA810056300A /* maxtrax.cpp in Sources */, + DF2040DE1380CA810056300A /* module.cpp in Sources */, + DF2040DF1380CA810056300A /* paula.cpp in Sources */, + DF2040E01380CA810056300A /* protracker.cpp in Sources */, + DF2040E11380CA810056300A /* rjp1.cpp in Sources */, + DF2040E21380CA810056300A /* soundfx.cpp in Sources */, + DF2040E31380CA810056300A /* tfmx.cpp in Sources */, + DF2041081380CAA40056300A /* adlib.cpp in Sources */, + DF2041091380CAA40056300A /* appleiigs.cpp in Sources */, + DF20410A1380CAA40056300A /* cms.cpp in Sources */, + DF20410B1380CAA40056300A /* eas.cpp in Sources */, + DF20410C1380CAA40056300A /* fluidsynth.cpp in Sources */, + DF20410D1380CAA40056300A /* mt32.cpp in Sources */, + DF20410E1380CAA40056300A /* pcspk.cpp in Sources */, + DF20410F1380CAA40056300A /* sid.cpp in Sources */, + DF2041101380CAA40056300A /* wave6581.cpp in Sources */, + DF46B6F51381E18900D08723 /* coroutine.cpp in Sources */, + DF46B7071381E1FF00D08723 /* towns_audio.cpp in Sources */, + DF46B7081381E1FF00D08723 /* towns_euphony.cpp in Sources */, + DF46B7091381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */, + DF46B70A1381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */, + DF46B7251381E27000D08723 /* console.cpp in Sources */, + DF46B7261381E27000D08723 /* databases.cpp in Sources */, + DF46B7271381E27000D08723 /* dbase.cpp in Sources */, + DF46B7281381E27000D08723 /* iniconfig.cpp in Sources */, + DF46B7291381E27000D08723 /* init_v7.cpp in Sources */, + DF46B72A1381E27000D08723 /* inter_inca2.cpp in Sources */, + DF46B7461381E40500D08723 /* log.cpp in Sources */, + DF46B74B1381E40F00D08723 /* modular-backend.cpp in Sources */, + DF46B7561381E46700D08723 /* player_v2base.cpp in Sources */, + DF46B7601381E4A400D08723 /* console.cpp in Sources */, + DF46B7651381E4D400D08723 /* robot_decoder.cpp in Sources */, + DF46B7691381E4E400D08723 /* vm_types.cpp in Sources */, + DF46B7851381E54200D08723 /* dcl.cpp in Sources */, + DF46B7861381E54200D08723 /* iff_container.cpp in Sources */, + DF46B7871381E54200D08723 /* winexe_ne.cpp in Sources */, + DF46B7881381E54200D08723 /* winexe_pe.cpp in Sources */, + DF46B7891381E54200D08723 /* winexe.cpp in Sources */, + DF46B7971381E58000D08723 /* png.cpp in Sources */, + DF46B7981381E58000D08723 /* wincursor.cpp in Sources */, + DF46B7A11381E5B500D08723 /* winfont.cpp in Sources */, + DF46B7AB1381E5F100D08723 /* header.cpp in Sources */, + DF46B7B61381E67800D08723 /* sdl-mutex.cpp in Sources */, + DF46B7BF1381E6C000D08723 /* object.cpp in Sources */, + DF46B7CA1381E72500D08723 /* console.cpp in Sources */, + DF46B7D81381E7C600D08723 /* console.cpp in Sources */, + DF46B83E1381F13500D08723 /* saveload_v7.cpp in Sources */, + DF46B8461381F35500D08723 /* saveload_inca2.cpp in Sources */, + DF46B84A1381F38700D08723 /* inter_v7.cpp in Sources */, + DF46B84F1381F39E00D08723 /* console.cpp in Sources */, + DF46B8541381F3B400D08723 /* console.cpp in Sources */, + DF46B8661381F44E00D08723 /* dbopl.cpp in Sources */, + DF46B8671381F44E00D08723 /* dosbox.cpp in Sources */, + DF46B8681381F44E00D08723 /* mame.cpp in Sources */, + DF46B8731381F4A200D08723 /* sdl-audiocd.cpp in Sources */, + DF46B87F1381F4F200D08723 /* default-audiocd.cpp in Sources */, + DF46B88B1381F5D800D08723 /* sdl-provider.cpp in Sources */, + DF46B8941381F62B00D08723 /* adpcm.cpp in Sources */, + DF46B89D1381F6C400D08723 /* null.cpp in Sources */, + DFADEBB513820DF500C46364 /* maccursor.cpp in Sources */, + DFADEBB913820E0C00C46364 /* posix-fs.cpp in Sources */, + F92B4DD0139DD428000D1BF1 /* quicktime.cpp in Sources */, + F92B4DD5139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */, + F9946D9F139E1A560072D195 /* towns_midi.cpp in Sources */, + F9946DA2139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */, + F9946DB7139E1A880072D195 /* freeverb.cpp in Sources */, + F9946DBA139E1A880072D195 /* i386.cpp in Sources */, + F9946DBD139E1A880072D195 /* mt32_file.cpp in Sources */, + F9946DC0139E1A880072D195 /* part.cpp in Sources */, + F9946DC3139E1A880072D195 /* partial.cpp in Sources */, + F9946DC6139E1A880072D195 /* partialManager.cpp in Sources */, + F9946DC9139E1A880072D195 /* synth.cpp in Sources */, + F9946DCC139E1A880072D195 /* tables.cpp in Sources */, + F9946DD8139E1AD30072D195 /* aac.cpp in Sources */, + F9946DDB139E1AD30072D195 /* qdm2.cpp in Sources */, + F9946DDE139E1AD30072D195 /* quicktime.cpp in Sources */, + F9946DE5139E1B180072D195 /* posix-main.cpp in Sources */, + F9946DE8139E1B180072D195 /* posix.cpp in Sources */, + F9946DEE139E1B6F0072D195 /* downscaler.cpp in Sources */, + F9946DF3139E1BA00072D195 /* console.cpp in Sources */, + F9946DF9139E1BBF0072D195 /* sdl-mixer.cpp in Sources */, + F9946E00139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */, + F9946E06139E1C3A0072D195 /* sdl-graphics.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -10843,6 +11801,44 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + IPHONE_OFFICIAL, + IPHONE, + POSIX, + ENABLE_SCUMM, + ENABLE_SCUMM_7_8, + ENABLE_HE, + ENABLE_AGI, + ENABLE_AGOS, + ENABLE_CINE, + ENABLE_CRUISE, + ENABLE_DRASCULA, + ENABLE_GOB, + ENABLE_GROOVIE, + ENABLE_IGOR, + ENABLE_KYRA, + ENABLE_LURE, + ENABLE_MADE, + ENABLE_PARALLACTION, + ENABLE_QUEEN, + ENABLE_SAGA, + ENABLE_IHNM, + ENABLE_SCI, + ENABLE_SKY, + ENABLE_SWORD1, + ENABLE_SWORD2, + ENABLE_TEENAGENT, + ENABLE_TINSEL, + ENABLE_TOUCHE, + ENABLE_TUCKER, + USE_FLAC, + USE_MAD, + USE_TREMOR, + USE_VORBIS, + USE_ZLIB, + USE_TREMOR, + USE_TRANSLATION, + ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = YES; HEADER_SEARCH_PATHS = ( @@ -10851,6 +11847,7 @@ include/, ); INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/lib\"", @@ -10858,10 +11855,11 @@ ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; PRODUCT_NAME = ScummVM; - PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8"; + PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos4.0; + SDKROOT = iphoneos4.2; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "armv6 armv7"; }; name = Debug; }; @@ -10883,49 +11881,10 @@ GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - GCC_THUMB_SUPPORT = NO; - GCC_UNROLL_LOOPS = YES; - HEADER_SEARCH_PATHS = ( - ../../engines/, - ../../, - include/, - ); - INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/lib\"", - ); - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - PRODUCT_NAME = ScummVM; - PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos3.2; - TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = ""; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_INPUT_FILETYPE = automatic; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - CONFIG_H, IPHONE_OFFICIAL, IPHONE, POSIX, - SCUMM_LITTLE_ENDIAN, - SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, ENABLE_SCUMM_7_8, ENABLE_HE, @@ -10957,7 +11916,48 @@ USE_TREMOR, USE_VORBIS, USE_ZLIB, + USE_TREMOR, + USE_TRANSLATION, + ); + GCC_THUMB_SUPPORT = NO; + GCC_UNROLL_LOOPS = YES; + HEADER_SEARCH_PATHS = ( + ../../engines/, + ../../, + include/, ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/lib\"", + ); + ONLY_ACTIVE_ARCH = YES; + PREBINDING = NO; + PRODUCT_NAME = ScummVM; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "armv6 armv7"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + CODE_SIGN_IDENTITY = "Don't Code Sign"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_EXCEPTIONS = NO; + GCC_ENABLE_CPP_RTTI = NO; + GCC_INPUT_FILETYPE = automatic; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_THUMB_SUPPORT = NO; GCC_USE_GCC3_PFE_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -10966,16 +11966,16 @@ ../../engines/, ../../, ); + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-lz"; PREBINDING = NO; - PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos4.0; + SDKROOT = ""; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; + VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7"; + WARNING_CFLAGS = "-Wno-multichar"; }; name = Debug; }; @@ -10983,91 +11983,40 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + CODE_SIGN_IDENTITY = "Don't Code Sign"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_EXCEPTIONS = NO; GCC_INPUT_FILETYPE = automatic; - GCC_PREPROCESSOR_DEFINITIONS = ( - CONFIG_H, - IPHONE_OFFICIAL, - IPHONE, - POSIX, - SCUMM_LITTLE_ENDIAN, - SCUMM_NEED_ALIGNMENT, - ENABLE_SCUMM, - ENABLE_SCUMM_7_8, - ENABLE_HE, - ENABLE_AGI, - ENABLE_AGOS, - ENABLE_CINE, - ENABLE_CRUISE, - ENABLE_DRASCULA, - ENABLE_GOB, - ENABLE_GROOVIE, - ENABLE_IGOR, - ENABLE_KYRA, - ENABLE_LURE, - ENABLE_MADE, - ENABLE_PARALLACTION, - ENABLE_QUEEN, - ENABLE_SAGA, - ENABLE_IHNM, - ENABLE_SCI, - ENABLE_SKY, - ENABLE_SWORD1, - ENABLE_SWORD2, - ENABLE_TEENAGENT, - ENABLE_TINSEL, - ENABLE_TOUCHE, - ENABLE_TUCKER, - USE_FLAC, - USE_MAD, - USE_TREMOR, - USE_VORBIS, - USE_ZLIB, - ); + GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_THUMB_SUPPORT = NO; GCC_USE_GCC3_PFE_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; HEADER_SEARCH_PATHS = ( - /opt/local/include/SDL, - /opt/local/include, - /sw/include/SDL, - /sw/include, ../../engines/, ../../, ); + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-lSDLmain", - "-logg", - "-lvorbisfile", - "-lvorbis", - "-lmad", - "-lFLAC", - "-lSDL", - "-lz", - ); + OTHER_LDFLAGS = ""; PREBINDING = NO; - PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphonesimulator3.2; + SDKROOT = ""; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; + VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7"; + WARNING_CFLAGS = "-Wno-multichar"; }; name = Release; }; DF0942280F63CB26002D821E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -11078,12 +12027,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( - CONFIG_H, MACOSX, SDL_BACKEND, POSIX, - SCUMM_LITTLE_ENDIAN, - SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, ENABLE_SCUMM_7_8, ENABLE_HE, @@ -11112,9 +12058,9 @@ ENABLE_TUCKER, USE_FLAC, USE_MAD, - USE_TREMOR, USE_VORBIS, USE_ZLIB, + USE_TRANSLATION, ); GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( @@ -11122,7 +12068,6 @@ /opt/local/include, /sw/include/SDL, /sw/include, - include/, ../../engines/, ../../, ); @@ -11132,7 +12077,8 @@ /opt/local/lib, "$(inherited)", ); - ONLY_ACTIVE_ARCH = NO; + MACOSX_DEPLOYMENT_TARGET = 10.4; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-lSDLmain", @@ -11146,15 +12092,16 @@ ); PREBINDING = NO; PRODUCT_NAME = ScummVM; - SDKROOT = macosx10.6; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64"; + SDKROOT = ""; + VALID_ARCHS = "i386 ppc ppc64 x86_64"; + WARNING_CFLAGS = "-Wno-multichar"; }; name = Debug; }; DF0942290F63CB26002D821E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -11163,12 +12110,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( - CONFIG_H, MACOSX, SDL_BACKEND, POSIX, - SCUMM_LITTLE_ENDIAN, - SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, ENABLE_SCUMM_7_8, ENABLE_HE, @@ -11197,9 +12141,9 @@ ENABLE_TUCKER, USE_FLAC, USE_MAD, - USE_TREMOR, USE_VORBIS, USE_ZLIB, + USE_TRANSLATION, ); GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( @@ -11216,7 +12160,8 @@ /opt/local/lib, "$(inherited)", ); - ONLY_ACTIVE_ARCH = NO; + MACOSX_DEPLOYMENT_TARGET = 10.4; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-lSDLmain", @@ -11230,8 +12175,9 @@ ); PREBINDING = NO; PRODUCT_NAME = ScummVM; - SDKROOT = macosx10.6; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64"; + SDKROOT = ""; + VALID_ARCHS = "i386 ppc ppc64 x86_64"; + WARNING_CFLAGS = "-Wno-multichar"; WRAPPER_EXTENSION = app; }; name = Release; @@ -11239,6 +12185,7 @@ DFF95CC80FB22D5700A3EC78 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; @@ -11267,6 +12214,7 @@ /opt/local/lib, "$(inherited)", ); + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lSDLmain", "-logg", @@ -11281,13 +12229,15 @@ PRODUCT_NAME = ScummVM; PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphonesimulator3.2; + SDKROOT = iphoneos; + VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; DFF95CC90FB22D5700A3EC78 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; @@ -11315,6 +12265,7 @@ /opt/local/lib, "$(inherited)", ); + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lSDLmain", "-logg", @@ -11329,7 +12280,8 @@ PRODUCT_NAME = ScummVM; PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphonesimulator3.2; + SDKROOT = iphoneos; + VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index d093c958e7..b0a304aad9 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -20,9 +20,6 @@ * */ -// FIXME: Avoid using printf -#define FORBIDDEN_SYMBOL_EXCEPTION_printf - #include "common/debug.h" #include "common/util.h" #include "common/hash-str.h" @@ -30,55 +27,13 @@ #include "common/macresman.h" #include "common/md5.h" #include "common/config-manager.h" +#include "common/system.h" #include "common/textconsole.h" +#include "common/translation.h" #include "engines/advancedDetector.h" -/** - * A list of pointers to ADGameDescription structs (or subclasses thereof). - */ -typedef Common::Array<const ADGameDescription*> ADGameDescList; - - -/** - * Detect games in specified directory. - * Parameters language and platform are used to pass on values - * specified by the user. I.e. this is used to restrict search scope. - * - * @param fslist FSList to scan or NULL for scanning all specified - * default directories. - * @param params a ADParams struct containing various parameters - * @param language restrict results to specified language only - * @param platform restrict results to specified platform only - * @return list of ADGameDescription (or subclass) pointers corresponding to matched games - */ -static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams ¶ms, Common::Language language, Common::Platform platform, const Common::String &extra); - - -/** - * Returns list of targets supported by the engine. - * Distinguishes engines with single ID - */ -static GameList gameIDList(const ADParams ¶ms) { - if (params.singleid != NULL) { - GameList gl; - - const PlainGameDescriptor *g = params.list; - while (g->gameid) { - if (0 == scumm_stricmp(params.singleid, g->gameid)) { - gl.push_back(GameDescriptor(g->gameid, g->description)); - - return gl; - } - g++; - } - error("Engine %s doesn't have its singleid specified in ids list", params.singleid); - } - - return GameList(params.list); -} - -static void upgradeTargetIfNecessary(const ADParams ¶ms) { +void AdvancedMetaEngine::upgradeTargetIfNecessary() const { if (params.obsoleteList == 0) return; @@ -110,11 +65,11 @@ namespace AdvancedDetector { GameDescriptor findGameID( const char *gameid, - const PlainGameDescriptor *list, + const PlainGameDescriptor *gameDescriptors, const ADObsoleteGameID *obsoleteList ) { - // First search the list of supported game IDs for a match. - const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, list); + // First search the list of supported gameids for a match. + const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, gameDescriptors); if (g) return GameDescriptor(*g); @@ -124,7 +79,7 @@ GameDescriptor findGameID( const ADObsoleteGameID *o = obsoleteList; while (o->from) { if (0 == scumm_stricmp(gameid, o->from)) { - g = findPlainGameDescriptor(o->to, list); + g = findPlainGameDescriptor(o->to, gameDescriptors); if (g && g->description) return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")"); else @@ -190,7 +145,7 @@ static Common::String generatePreferredTarget(const Common::String &id, const AD return res; } -static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc, const ADParams ¶ms) { +void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const { if (params.singleid != NULL) { desc["preferredtarget"] = desc["gameid"]; desc["gameid"] = params.singleid; @@ -235,7 +190,7 @@ bool cleanupPirated(ADGameDescList &matched) { GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { - ADGameDescList matches = detectGame(fslist, params, Common::UNK_LANG, Common::kPlatformUnknown, ""); + ADGameDescList matches = detectGame(fslist, Common::UNK_LANG, Common::kPlatformUnknown, ""); GameList detectedGames; if (cleanupPirated(matches)) @@ -245,15 +200,15 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { // Use fallback detector if there were no matches by other means const ADGameDescription *fallbackDesc = fallbackDetect(fslist); if (fallbackDesc != 0) { - GameDescriptor desc(toGameDescriptor(*fallbackDesc, params.list)); - updateGameDescriptor(desc, fallbackDesc, params); + GameDescriptor desc(toGameDescriptor(*fallbackDesc, params.gameDescriptors)); + updateGameDescriptor(desc, fallbackDesc); detectedGames.push_back(desc); } } else { // Otherwise use the found matches for (uint i = 0; i < matches.size(); i++) { - GameDescriptor desc(toGameDescriptor(*matches[i], params.list)); - updateGameDescriptor(desc, matches[i], params); + GameDescriptor desc(toGameDescriptor(*matches[i], params.gameDescriptors)); + updateGameDescriptor(desc, matches[i]); detectedGames.push_back(desc); } } @@ -263,7 +218,7 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) const { assert(engine); - upgradeTargetIfNecessary(params); + upgradeTargetIfNecessary(); const ADGameDescription *agdDesc = 0; Common::Language language = Common::UNK_LANG; @@ -306,7 +261,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) return Common::kNoGameDataFoundError; } - ADGameDescList matches = detectGame(files, params, language, platform, extra); + ADGameDescList matches = detectGame(files, language, platform, extra); if (cleanupPirated(matches)) return Common::kNoGameDataFoundError; @@ -345,7 +300,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) Common::updateGameGUIOptions(agdDesc->guioptions | params.guioptions, lang); - debug(2, "Running %s", toGameDescriptor(*agdDesc, params.list).description().c_str()); + debug(2, "Running %s", toGameDescriptor(*agdDesc, params.gameDescriptors).description().c_str()); if (!createInstance(syst, engine, agdDesc)) return Common::kNoGameDataFoundError; else @@ -358,7 +313,6 @@ struct SizeMD5 { }; typedef Common::HashMap<Common::String, SizeMD5, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> SizeMD5Map; -typedef Common::HashMap<Common::String, Common::FSNode, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap; static void reportUnknown(const Common::FSNode &path, const SizeMD5Map &filesSizeMD5) { // TODO: This message should be cleaned up / made more specific. @@ -366,36 +320,36 @@ static void reportUnknown(const Common::FSNode &path, const SizeMD5Map &filesSiz // // Might also be helpful to display the full path (for when this is used // from the mass detector). - printf("The game in '%s' seems to be unknown.\n", path.getPath().c_str()); - printf("Please, report the following data to the ScummVM team along with name\n"); - printf("of the game you tried to add and its version/language/etc.:\n"); + Common::String report = Common::String::format(_("The game in '%s' seems to be unknown."), path.getPath().c_str()) + "\n"; + report += _("Please, report the following data to the ScummVM team along with name"); + report += "\n"; + report += _("of the game you tried to add and its version/language/etc.:"); + report += "\n"; for (SizeMD5Map::const_iterator file = filesSizeMD5.begin(); file != filesSizeMD5.end(); ++file) - printf(" {\"%s\", 0, \"%s\", %d},\n", file->_key.c_str(), file->_value.md5.c_str(), file->_value.size); + report += Common::String::format(" {\"%s\", 0, \"%s\", %d},\n", file->_key.c_str(), file->_value.md5.c_str(), file->_value.size); - printf("\n"); -} + report += "\n"; -static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParams ¶ms); + g_system->logMessage(LogMessageType::kInfo, report.c_str()); +} -static void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth, const char * const *directoryGlobs) { +void AdvancedMetaEngine::composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth) const { if (depth <= 0) return; if (fslist.empty()) return; - // First we compose a hashmap of all files in fslist. - // Includes nifty stuff like removing trailing dots and ignoring case. for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (file->isDirectory()) { Common::FSList files; - if (!directoryGlobs) + if (!params.directoryGlobs) continue; bool matched = false; - for (const char * const *glob = directoryGlobs; *glob; glob++) + for (const char * const *glob = params.directoryGlobs; *glob; glob++) if (file->getName().matchString(*glob, true)) { matched = true; break; @@ -407,7 +361,7 @@ static void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, if (!file->getChildren(files, Common::FSNode::kListAll)) continue; - composeFileHashMap(files, allFiles, depth - 1, directoryGlobs); + composeFileHashMap(files, allFiles, depth - 1); } Common::String tstr = file->getName(); @@ -420,7 +374,7 @@ static void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, } } -static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams ¶ms, Common::Language language, Common::Platform platform, const Common::String &extra) { +ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Common::Language language, Common::Platform platform, const Common::String &extra) const { FileMap allFiles; SizeMD5Map filesSizeMD5; @@ -434,8 +388,7 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p debug(3, "Starting detection in dir '%s'", parent.getPath().c_str()); // First we compose a hashmap of all files in fslist. - // Includes nifty stuff like removing trailing dots and ignoring case. - composeFileHashMap(fslist, allFiles, (params.depth == 0 ? 1 : params.depth), params.directoryGlobs); + composeFileHashMap(fslist, allFiles, (params.depth == 0 ? 1 : params.depth)); // Check which files are included in some ADGameDescription *and* present // in fslist. Compute MD5s and file sizes for these files. @@ -453,16 +406,14 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p // file and as one with resource fork. if (g->flags & ADGF_MACRESFORK) { - Common::MacResManager *macResMan = new Common::MacResManager(); + Common::MacResManager macResMan; - if (macResMan->open(parent, fname)) { - tmp.md5 = macResMan->computeResForkMD5AsString(params.md5Bytes); - tmp.size = macResMan->getResForkDataSize(); + if (macResMan.open(parent, fname)) { + tmp.md5 = macResMan.computeResForkMD5AsString(params.md5Bytes); + tmp.size = macResMan.getResForkDataSize(); debug(3, "> '%s': '%s'", fname.c_str(), tmp.md5.c_str()); filesSizeMD5[fname] = tmp; } - - delete macResMan; } else { if (allFiles.contains(fname)) { debug(3, "+ %s", fname.c_str()); @@ -575,19 +526,13 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p // Filename based fallback if (params.fileBasedFallback != 0) - matched = detectGameFilebased(allFiles, params); + matched = detectGameFilebased(allFiles); } return matched; } -/** - * Check for each ADFileBasedFallback record whether all files listed - * in it are present. If multiple pass this test, we pick the one with - * the maximal number of matching files. In case of a tie, the entry - * coming first in the list is chosen. - */ -static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParams ¶ms) { +ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) const { const ADFileBasedFallback *ptr; const char* const* filenames; @@ -626,10 +571,14 @@ static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParam if (matchedDesc) { // We got a match matched.push_back(matchedDesc); if (params.flags & kADFlagPrintWarningOnFileBasedFallback) { - printf("Your game version has been detected using filename matching as a\n"); - printf("variant of %s.\n", matchedDesc->gameid); - printf("If this is an original and unmodified version, please report any\n"); - printf("information previously printed by ScummVM to the team.\n"); + Common::String report = Common::String::format(_("Your game version has been detected using " + "filename matching as a variant of %s."), matchedDesc->gameid); + report += "\n"; + report += _("If this is an original and unmodified version, please report any"); + report += "\n"; + report += _("information previously printed by ScummVM to the team."); + report += "\n"; + g_system->logMessage(LogMessageType::kInfo, report.c_str()); } } @@ -637,8 +586,38 @@ static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParam } GameList AdvancedMetaEngine::getSupportedGames() const { - return gameIDList(params); + if (params.singleid != NULL) { + GameList gl; + + const PlainGameDescriptor *g = params.gameDescriptors; + while (g->gameid) { + if (0 == scumm_stricmp(params.singleid, g->gameid)) { + gl.push_back(GameDescriptor(g->gameid, g->description)); + + return gl; + } + g++; + } + error("Engine %s doesn't have its singleid specified in ids list", params.singleid); + } + + return GameList(params.gameDescriptors); } + GameDescriptor AdvancedMetaEngine::findGame(const char *gameid) const { - return AdvancedDetector::findGameID(gameid, params.list, params.obsoleteList); + return AdvancedDetector::findGameID(gameid, params.gameDescriptors, params.obsoleteList); +} + +AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameDescriptors) { + params.descs = (const byte *)descs; + params.descItemSize = descItemSize; + params.md5Bytes = 5000; + params.gameDescriptors = gameDescriptors; + params.obsoleteList = NULL; + params.singleid = NULL; + params.fileBasedFallback = NULL; + params.flags = 0; + params.guioptions = Common::GUIO_NONE; + params.depth = 1; + params.directoryGlobs = NULL; } diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 408c46556d..e5922bea4a 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -71,6 +71,11 @@ struct ADGameDescription { }; /** + * A list of pointers to ADGameDescription structs (or subclasses thereof). + */ +typedef Common::Array<const ADGameDescription*> ADGameDescList; + +/** * End marker for a table of ADGameDescription structs. Use this to * terminate a list to be passed to the AdvancedDetector API. */ @@ -148,7 +153,7 @@ struct ADParams { * A list of all gameids (and their corresponding descriptions) supported * by this engine. */ - const PlainGameDescriptor *list; + const PlainGameDescriptor *gameDescriptors; /** * Structure for autoupgrading obsolete targets (optional). @@ -214,7 +219,7 @@ namespace AdvancedDetector { */ GameDescriptor findGameID( const char *gameid, - const PlainGameDescriptor *list, + const PlainGameDescriptor *gameDescriptors, const ADObsoleteGameID *obsoleteList = 0 ); @@ -224,16 +229,26 @@ GameDescriptor findGameID( * A MetaEngine implementation based around the advanced detector code. */ class AdvancedMetaEngine : public MetaEngine { - const ADParams ¶ms; +protected: + ADParams params; public: AdvancedMetaEngine(const ADParams &dp) : params(dp) {} + AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameDescriptors); + /** + * Returns list of targets supported by the engine. + * Distinguishes engines with single ID + */ virtual GameList getSupportedGames() const; + virtual GameDescriptor findGame(const char *gameid) const; + virtual GameList detectGames(const Common::FSList &fslist) const; + virtual Common::Error createInstance(OSystem *syst, Engine **engine) const; - // To be provided by subclasses +protected: + // To be implemented by subclasses virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const = 0; /** @@ -244,6 +259,40 @@ public: virtual const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { return 0; } + +protected: + typedef Common::HashMap<Common::String, Common::FSNode, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap; + + /** + * Detect games in specified directory. + * Parameters language and platform are used to pass on values + * specified by the user. I.e. this is used to restrict search scope. + * + * @param fslist FSList to scan or NULL for scanning all specified + * default directories. + * @param language restrict results to specified language only + * @param platform restrict results to specified platform only + * @return list of ADGameDescription (or subclass) pointers corresponding to matched games + */ + ADGameDescList detectGame(const Common::FSList &fslist, Common::Language language, Common::Platform platform, const Common::String &extra) const; + + /** + * Check for each ADFileBasedFallback record whether all files listed + * in it are present. If multiple pass this test, we pick the one with + * the maximal number of matching files. In case of a tie, the entry + * coming first in the list is chosen. + */ + ADGameDescList detectGameFilebased(const FileMap &allFiles) const; + + void upgradeTargetIfNecessary() const; + + void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const; + + /** + * Compose a hashmap of all files in fslist. + * Includes nifty stuff like removing trailing dots and ignoring case. + */ + void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth) const; }; #endif diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 78316588b0..811a58f45d 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -131,46 +131,65 @@ void AgiEngine::processEvents() { switch (key = event.kbd.keycode) { case Common::KEYCODE_LEFT: case Common::KEYCODE_KP4: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP4) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_LEFT; break; case Common::KEYCODE_RIGHT: case Common::KEYCODE_KP6: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP6) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_RIGHT; break; case Common::KEYCODE_UP: case Common::KEYCODE_KP8: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP8) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_UP; break; case Common::KEYCODE_DOWN: case Common::KEYCODE_KP2: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP2) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_DOWN; break; case Common::KEYCODE_PAGEUP: case Common::KEYCODE_KP9: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP9) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_UP_RIGHT; break; case Common::KEYCODE_PAGEDOWN: case Common::KEYCODE_KP3: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP3) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_DOWN_RIGHT; break; case Common::KEYCODE_HOME: case Common::KEYCODE_KP7: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP7) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_UP_LEFT; break; case Common::KEYCODE_END: case Common::KEYCODE_KP1: - if (_allowSynthetic || !event.synthetic) + if (_predictiveDialogRunning && key == Common::KEYCODE_KP1) + key = event.kbd.ascii; + else if (_allowSynthetic || !event.synthetic) key = KEY_DOWN_LEFT; break; case Common::KEYCODE_KP5: - key = KEY_STATIONARY; + if (_predictiveDialogRunning) + key = event.kbd.ascii; + else + key = KEY_STATIONARY; break; case Common::KEYCODE_PLUS: key = '+'; diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 22d8adf92d..b0e055edcc 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -129,31 +129,6 @@ static const PlainGameDescriptor agiGames[] = { #include "agi/detection_tables.h" -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Agi::gameDescriptions, - // Size of that superset structure - sizeof(Agi::AGIGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - agiGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "agi", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOSPEECH, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - using namespace Agi; class AgiMetaEngine : public AdvancedMetaEngine { @@ -161,7 +136,10 @@ class AgiMetaEngine : public AdvancedMetaEngine { mutable Common::String _extra; public: - AgiMetaEngine() : AdvancedMetaEngine(detectionParams) {} + AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames) { + params.singleid = "agi"; + params.guioptions = Common::GUIO_NOSPEECH; + } virtual const char *getName() const { return "AGI preAGI + v2 + v3"; diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp index 80e89f410b..edfe83b1cb 100644 --- a/engines/agi/predictive.cpp +++ b/engines/agi/predictive.cpp @@ -190,7 +190,7 @@ bool AgiEngine::predictiveDialog() { bool needRefresh = true; - for (;;) { + while (!shouldQuit()) { if (needRefresh) { for (int i = 0; buttons[i]; i++) { int color1 = colors[i * 2]; @@ -573,8 +573,10 @@ bool AgiEngine::matchWord() { hi = line - 1; else if (cmpVal < 0) lo = line + 1; - else + else { hi = line; + break; + } } _currentWord.clear(); diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp index 6d64c29de9..3c8a3dfc8d 100644 --- a/engines/agi/sound_2gs.cpp +++ b/engines/agi/sound_2gs.cpp @@ -135,7 +135,7 @@ void SoundGen2GS::stop() { * Fill output buffer by advancing the generators for a 1/60th of a second. * @return Number of generated samples */ -uint32 SoundGen2GS::generateOutput() { +uint SoundGen2GS::generateOutput() { memset(_out, 0, _outSize * 2 * 2); if (!_playing || _playingSound == -1) diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp index 319b7049ed..fdebf16b1a 100644 --- a/engines/agi/sound_pcjr.cpp +++ b/engines/agi/sound_pcjr.cpp @@ -219,6 +219,7 @@ int SoundGenPCJr::volumeCalc(SndGenChan *chan) { // return 0 if it's passing more data // return -1 if it's passing nothing (end of data) int SoundGenPCJr::getNextNote(int ch, Tone *tone) { + ToneChan *tpcm; SndGenChan *chan; const byte *data; @@ -228,6 +229,7 @@ int SoundGenPCJr::getNextNote(int ch, Tone *tone) { if (!_vm->getflag(fSoundOn)) return -1; + tpcm = &_tchannel[ch]; chan = &_channel[ch]; if (!chan->avail) return -1; @@ -241,6 +243,9 @@ int SoundGenPCJr::getNextNote(int ch, Tone *tone) { // if it's 0 then it's not going to be played // if it's 0xFFFF then the channel data has finished. if ((chan->duration != 0) && (chan->duration != 0xFFFF)) { + tpcm->genTypePrev = -1; + tpcm->freqCountPrev = -1; + // only tone channels dissolve if ((ch != 3) && (_dissolveMethod != 0)) // != noise?? chan->dissolveCount = 0; diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 629a5d63fc..dbd1743304 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -63,7 +63,7 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { {0, 0, Common::kPlatformUnknown} }; -static const PlainGameDescriptor simonGames[] = { +static const PlainGameDescriptor agosGames[] = { {"pn", "Personal Nightmare"}, {"elvira1", "Elvira - Mistress of the Dark"}, {"elvira2", "Elvira II - The Jaws of Cerberus"}, @@ -87,36 +87,16 @@ static const char *directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)AGOS::gameDescriptions, - // Size of that superset structure - sizeof(AGOS::AGOSGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - simonGames, - // Structure for autoupgrading obsolete targets - obsoleteGameIDsTable, - // Name of single gameid (optional) - 0, - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOLAUNCHLOAD, - // Maximum directory depth - 2, - // List of directory globs - directoryGlobs -}; - using namespace AGOS; class AgosMetaEngine : public AdvancedMetaEngine { public: - AgosMetaEngine() : AdvancedMetaEngine(detectionParams) {} + AgosMetaEngine() : AdvancedMetaEngine(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { + params.obsoleteList = obsoleteGameIDsTable; + params.guioptions = Common::GUIO_NOLAUNCHLOAD; + params.depth = 2; + params.directoryGlobs = directoryGlobs; + } virtual const char *getName() const { return "AGOS"; diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 738366124c..89c81c2599 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -60,34 +60,13 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { #include "cine/detection_tables.h" -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Cine::gameDescriptions, - // Size of that superset structure - sizeof(Cine::CINEGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - cineGames, - // Structure for autoupgrading obsolete targets - obsoleteGameIDsTable, - // Name of single gameid (optional) - "cine", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class CineMetaEngine : public AdvancedMetaEngine { public: - CineMetaEngine() : AdvancedMetaEngine(detectionParams) {} + CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames) { + params.obsoleteList = obsoleteGameIDsTable; + params.singleid = "cine"; + params.guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; + } virtual const char *getName() const { return "Cine"; diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 3bd0c1f76f..f6f8db4f3a 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -217,34 +217,12 @@ static const CRUISEGameDescription gameDescriptions[] = { } -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Cruise::gameDescriptions, - // Size of that superset structure - sizeof(Cruise::CRUISEGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - cruiseGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "cruise", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class CruiseMetaEngine : public AdvancedMetaEngine { public: - CruiseMetaEngine() : AdvancedMetaEngine(detectionParams) {} + CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { + params.singleid = "cruise"; + params.guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; + } virtual const char *getName() const { return "CruisE"; diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index d3483eb5a4..cf0413ffa9 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -83,34 +83,11 @@ const ADGameDescription gameDescriptions[] = { } // End of namespace Draci -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Draci::gameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - draciGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "draci", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class DraciMetaEngine : public AdvancedMetaEngine { public: - DraciMetaEngine() : AdvancedMetaEngine(detectionParams) {} + DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { + params.singleid = "draci"; + } virtual const char *getName() const { return "Draci"; diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 5a8903db9d..9494bfa66b 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -266,34 +266,12 @@ static const DrasculaGameDescription gameDescriptions[] = { } // End of namespace Drascula -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Drascula::gameDescriptions, - // Size of that superset structure - sizeof(Drascula::DrasculaGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - drasculaGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "drascula", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class DrasculaMetaEngine : public AdvancedMetaEngine { public: - DrasculaMetaEngine() : AdvancedMetaEngine(detectionParams) {} + DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { + params.singleid = "drascula"; + params.guioptions = Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD; + } virtual const char *getName() const { return "Drascula"; diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index be44c05bfb..2ecd6b741e 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -86,34 +86,14 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { #include "gob/detection_tables.h" -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Gob::gameDescriptions, - // Size of that superset structure - sizeof(Gob::GOBGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - gobGames, - // Structure for autoupgrading obsolete targets - obsoleteGameIDsTable, - // Name of single gameid (optional) - "gob", - // List of files for file-based fallback detection (optional) - Gob::fileBased, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOLAUNCHLOAD, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class GobMetaEngine : public AdvancedMetaEngine { public: - GobMetaEngine() : AdvancedMetaEngine(detectionParams) {} + GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { + params.obsoleteList = obsoleteGameIDsTable; + params.singleid = "gob"; + params.fileBasedFallback = Gob::fileBased; + params.guioptions = Common::GUIO_NOLAUNCHLOAD; + } virtual const char *getName() const { return "Gob"; diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index 0dd510abca..62ee65d74a 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -202,35 +202,13 @@ static const GroovieGameDescription gameDescriptions[] = { {AD_TABLE_END_MARKER, kGroovieT7G, 0} }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)gameDescriptions, - // Size of that superset structure - sizeof(GroovieGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - groovieGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "groovie", - // List of files for file-based fallback detection (optional) - 0, - // Flags - kADFlagUseExtraAsHint, - // Additional GUI options (for every game} - Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - - class GroovieMetaEngine : public AdvancedMetaEngine { public: - GroovieMetaEngine() : AdvancedMetaEngine(detectionParams) {} + GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames) { + params.singleid = "groovie"; + params.flags = kADFlagUseExtraAsHint; + params.guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; + } const char *getName() const { return "Groovie"; diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 8b6ee2ca42..5f95de649a 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -336,11 +336,6 @@ bool GroovieEngine::hasFeature(EngineFeature f) const { (f == kSupportsLoadingDuringRuntime); } -void GroovieEngine::errorString(const char *buf_input, char *buf_output, int buf_output_size) { - //snprintf(buf_output, buf_output_size, "%s%s\n", _script.getContext().c_str(), buf_input); - snprintf(buf_output, buf_output_size, "%s", buf_input); -} - void GroovieEngine::syncSoundSettings() { Engine::syncSoundSettings(); diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h index eb64cfc60a..df2f062757 100644 --- a/engines/groovie/groovie.h +++ b/engines/groovie/groovie.h @@ -91,7 +91,6 @@ protected: // Engine APIs Common::Error run(); - virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size); virtual bool hasFeature(EngineFeature f) const; diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 9a3903e9dc..33fc986193 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -845,6 +845,9 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) { if (loop) audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); + // MIDI player handles volume reset on load, IOS player doesn't - force update here + updateVolume(); + // Play! _vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_handle, audStream); return true; diff --git a/engines/groovie/resource.cpp b/engines/groovie/resource.cpp index 05b43b7d3c..c26f04d6ee 100644 --- a/engines/groovie/resource.cpp +++ b/engines/groovie/resource.cpp @@ -169,7 +169,7 @@ bool ResMan_t7g::getResInfo(uint32 fileRef, ResInfo &resInfo) { error("Groovie::Resource: Invalid resource number: 0x%04X (%s)", resNum, rlFileName.c_str()); } - // Read the resource name (just for debugging purposes) + // Read the resource name char resname[13]; rlFile->read(resname, 12); resname[12] = 0; @@ -240,7 +240,7 @@ uint32 ResMan_v2::getRef(Common::String name, Common::String scriptname) { // Test whether it's the resource we're searching Common::String resname(readname, 18); if (resname.hasPrefix(name.c_str())) { - debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource %12s matches %s", readname, name.c_str()); + debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource %18s matches %s", readname, name.c_str()); found = true; } } @@ -279,10 +279,11 @@ bool ResMan_v2::getResInfo(uint32 fileRef, ResInfo &resInfo) { resInfo.size = rlFile.readUint32LE(); resInfo.gjd = rlFile.readUint16LE(); - // Read the resource name (just for debugging purposes) - char resname[12]; - rlFile.read(resname, 12); - debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource name: %12s", resname); + // Read the resource name + char resname[19]; + resname[18] = 0; + rlFile.read(resname, 18); + debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource name: %18s", resname); resInfo.filename = resname; // 6 padding bytes? (it looks like they're always 0) diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp index 25b8b16084..f70a21aa8f 100644 --- a/engines/hugo/detection.cpp +++ b/engines/hugo/detection.cpp @@ -131,34 +131,10 @@ static const HugoGameDescription gameDescriptions[] = { {AD_TABLE_END_MARKER, kGameTypeNone} }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)gameDescriptions, - // Size of that superset structure - sizeof(HugoGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - hugoGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - 0, - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class HugoMetaEngine : public AdvancedMetaEngine { public: - HugoMetaEngine() : AdvancedMetaEngine(detectionParams) {} + HugoMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(HugoGameDescription), hugoGames) { + } const char *getName() const { return "Hugo"; diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp index 6db2e45b0e..84bda3f3fd 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/animator_mr.cpp @@ -449,11 +449,10 @@ void KyraEngine_MR::showIdleAnim() { "A", "R", "R", "FR", "FX", "FL", "L", "L" }; - char filename[14]; - snprintf(filename, 14, "MI0%s%.02d.EMC", facingTable[_mainCharacter.facing], _characterShapeFile); + Common::String filename = Common::String::format( "MI0%s%.02d.EMC", facingTable[_mainCharacter.facing], _characterShapeFile); - if (_res->exists(filename)) - runAnimationScript(filename, 1, 1, 1, 1); + if (_res->exists(filename.c_str())) + runAnimationScript(filename.c_str(), 1, 1, 1, 1); } _nextIdleType = !_nextIdleType; diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 47a086e08c..6589c2b45b 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -47,37 +47,15 @@ const char * const directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)adGameDescs, - // Size of that superset structure - sizeof(KYRAGameDescription), - // Number of bytes to compute MD5 sum for - 1024 * 1024, - // List of all engine targets - gameList, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - 0, - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 2, - // List of directory globs - directoryGlobs -}; - } // End of anonymous namespace class KyraMetaEngine : public AdvancedMetaEngine { public: - KyraMetaEngine() : AdvancedMetaEngine(detectionParams) {} - + KyraMetaEngine() : AdvancedMetaEngine(adGameDescs, sizeof(KYRAGameDescription), gameList) { + params.md5Bytes = 1024 * 1024; + params.depth = 2; + params.directoryGlobs = directoryGlobs; + } const char *getName() const { return "Kyra"; } diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h index 8a948eff00..47a3c4362a 100644 --- a/engines/kyra/detection_tables.h +++ b/engines/kyra/detection_tables.h @@ -47,6 +47,7 @@ namespace { #define KYRA3_CD_FAN_FLAGS(x, y) FLAGS_FAN(x, y, false, false, true, false, false, true, false, Kyra::GI_KYRA3) #define LOL_CD_FLAGS FLAGS(false, false, true, false, false, false, false, Kyra::GI_LOL) +#define LOL_CD_FAN_FLAGS(x, y) FLAGS_FAN(x, y, false, false, true, false, false, false, false, Kyra::GI_LOL) #define LOL_FLOPPY_FLAGS FLAGS(false, false, false, false, false, false, false, Kyra::GI_LOL) #define LOL_FLOPPY_CMP_FLAGS FLAGS(false, false, false, false, false, false, true, Kyra::GI_LOL) #define LOL_PC98_SJIS_FLAGS FLAGS(false, false, false, true, true, false, false, Kyra::GI_LOL) @@ -1056,6 +1057,109 @@ const KYRAGameDescription adGameDescs[] = { LOL_CD_FLAGS }, + // Italian fan translation + { + { + "lol", + "CD", + { + { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 }, + { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 }, + { 0, 0, 0, 0 } + }, + Common::IT_ITA, + Common::kPlatformPC, + ADGF_DROPLANGUAGE | ADGF_CD, + Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + }, + LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) + }, + + { + { + "lol", + "CD", + { + { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 }, + { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 }, + { 0, 0, 0, 0 } + }, + Common::DE_DEU, + Common::kPlatformPC, + ADGF_DROPLANGUAGE | ADGF_CD, + Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + }, + LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) + }, + + { + { + "lol", + "CD", + { + { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 }, + { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 }, + { 0, 0, 0, 0 } + }, + Common::FR_FRA, + Common::kPlatformPC, + ADGF_DROPLANGUAGE | ADGF_CD, + Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + }, + LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) + }, + + { + { + "lol", + "CD", + { + { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 }, + { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 }, + { 0, 0, 0, 0 } + }, + Common::IT_ITA, + Common::kPlatformPC, + ADGF_DROPLANGUAGE | ADGF_CD, + Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + }, + LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) + }, + + { + { + "lol", + "CD", + { + { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 }, + { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 }, + { 0, 0, 0, 0 } + }, + Common::DE_DEU, + Common::kPlatformPC, + ADGF_DROPLANGUAGE | ADGF_CD, + Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + }, + LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) + }, + + { + { + "lol", + "CD", + { + { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 }, + { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 }, + { 0, 0, 0, 0 } + }, + Common::FR_FRA, + Common::kPlatformPC, + ADGF_DROPLANGUAGE | ADGF_CD, + Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + }, + LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) + }, + { { "lol", @@ -1222,7 +1326,6 @@ const KYRAGameDescription adGameDescs[] = { LOL_KYRA2_DEMO_FLAGS }, #endif // ENABLE_LOL - { AD_TABLE_END_MARKER, FLAGS(0, 0, 0, 0, 0, 0, 0, 0) } }; diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index 4c4dc50503..fb11040168 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -2806,15 +2806,18 @@ int GUI_LoL::clickedOptionsMenu(Button *button) { case 0xfff3: _vm->_configVoice ^= 3; break; - case 0x4072: - char filename[13]; - snprintf(filename, sizeof(filename), "LEVEL%02d.%s", _vm->_currentLevel, _vm->_languageExt[_vm->_lang]); + case 0x4072: { + Common::String filename; + filename = Common::String::format("LEVEL%02d.%s", _vm->_currentLevel, _vm->_languageExt[_vm->_lang]); delete[] _vm->_levelLangFile; - _vm->_levelLangFile = _vm->resource()->fileData(filename, 0); - snprintf(filename, sizeof(filename), "LANDS.%s", _vm->_languageExt[_vm->_lang]); + _vm->_levelLangFile = _vm->resource()->fileData(filename.c_str(), 0); + filename = Common::String::format("LANDS.%s", _vm->_languageExt[_vm->_lang]); delete[] _vm->_landsFile; - _vm->_landsFile = _vm->resource()->fileData(filename, 0); + _vm->_landsFile = _vm->resource()->fileData(filename.c_str(), 0); _newMenu = _lastMenu; + } break; + default: + // TODO: Is there anything we should do if we hit this case? break; } diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index 25a77c6cc8..32eb02e06d 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -717,25 +717,25 @@ void KyraEngine_MR::showAlbum() { } void KyraEngine_MR::loadAlbumPage() { - char filename[16]; + Common::String filename; int num = _album.curPage / 2; if (num == 0) { - strcpy(filename, "ALBUM0.CPS"); + filename = "ALBUM0.CPS"; } else if (num >= 1 && num <= 6) { --num; num %= 2; - snprintf(filename, 16, "ALBUM%d.CPS", num+1); + filename = Common::String::format("ALBUM%d.CPS", num+1); } else { - strcpy(filename, "ALBUM3.CPS"); + filename = "ALBUM3.CPS"; } _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 4, Screen::CR_NO_P_CHECK); - _screen->loadBitmap(filename, 3, 3, 0); + _screen->loadBitmap(filename.c_str(), 3, 3, 0); } void KyraEngine_MR::loadAlbumPageWSA() { - char filename[16]; + Common::String filename; _album.leftPage.curFrame = 0; _album.leftPage.maxFrame = 0; @@ -746,14 +746,14 @@ void KyraEngine_MR::loadAlbumPageWSA() { _album.rightPage.wsa->close(); if (_album.curPage) { - snprintf(filename, 16, "PAGE%x.WSA", _album.curPage); - _album.leftPage.wsa->open(filename, 1, 0); + filename = Common::String::format("PAGE%x.WSA", _album.curPage); + _album.leftPage.wsa->open(filename.c_str(), 1, 0); _album.leftPage.maxFrame = _album.leftPage.wsa->frames()-1; } if (_album.curPage != 14) { - snprintf(filename, 16, "PAGE%x.WSA", _album.curPage+1); - _album.rightPage.wsa->open(filename, 1, 0); + filename = Common::String::format("PAGE%x.WSA", _album.curPage+1); + _album.rightPage.wsa->open(filename.c_str(), 1, 0); _album.rightPage.maxFrame = _album.leftPage.wsa->frames()-1; } } diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp index b6388604f5..2cf2cb2c70 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/items_lol.cpp @@ -396,20 +396,20 @@ bool LoLEngine::launchObject(int objectType, Item item, int startX, int startY, return true; } -void LoLEngine::endObjectFlight(FlyingObject *t, int x, int y, int objectOnNextBlock) { +void LoLEngine::endObjectFlight(FlyingObject *t, int x, int y, int collisionObject) { int cx = x; int cy = y; uint16 block = calcBlockIndex(t->x, t->y); removeAssignedObjectFromBlock(&_levelBlockProperties[block], t->item); removeDrawObjectFromBlock(&_levelBlockProperties[block], t->item); - if (objectOnNextBlock == 1) { + if (collisionObject == 1) { cx = t->x; cy = t->y; } if (t->objectType == 0 || t->objectType == 1) { - objectFlightProcessHits(t, cx, cy, objectOnNextBlock); + objectFlightProcessHits(t, cx, cy, collisionObject); t->x = (cx & 0xffc0) | 0x40; t->y = (cy & 0xffc0) | 0x40; t->flyingHeight = 0; @@ -481,8 +481,24 @@ void LoLEngine::updateFlyingObject(FlyingObject *t) { int x = 0; int y = 0; getNextStepCoords(t->x, t->y, x, y, t->direction); - // WORKAROUND: The next line seems to be bugged in the original code. I have fixed it in a way that at least seems to work fine. - int objectOnNextBlock = checkBlockBeforeObjectPlacement(x, y, _itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000 ? 127 : 63, t->flags, t->wallFlags); + /* WORKAROUND: + Large fireballs cast by the "birds" in white tower level 2 and by the "wraith knights" in castle cimmeria + level 1 (or possible other objects with flag 0x4000) could not fly through corridors in ScummVM and would + be terminated prematurely. The original code (all versions) involuntarily circumvents this via a bug in the + next line of code. + The original checks for _itemProperties[t->item].flags instead of _itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags. + This leads to more or less unpredictable object widths. The large fireballs will usually get a width of 63 + instead of 256 making them work just fine in the original. + + I have fixed this by setting an object width of 63 of here. This produces results faithful to the original + at least. + + Other methods of working around this issue don't make too much sense. An object with a width of 256 + could never fly through corridors, since 256 is also the width of a block. Aligning the fireballs to the + 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); } else { diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 4ce5c5b2cf..973ab25088 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -366,10 +366,9 @@ void KyraEngine_MR::uninitMainMenu() { void KyraEngine_MR::playVQA(const char *name) { VQAMovie vqa(this, _system); - char filename[20]; - snprintf(filename, sizeof(filename), "%s%d.VQA", name, _configVQAQuality); + Common::String filename = Common::String::format("%s%d.VQA", name, _configVQAQuality); - if (vqa.open(filename)) { + if (vqa.open(filename.c_str())) { for (int i = 0; i < 4; ++i) { if (i != _musicSoundChannel) _soundDigital->stopSound(i); @@ -444,12 +443,11 @@ void KyraEngine_MR::fadeOutMusic(int ticks) { void KyraEngine_MR::snd_playSoundEffect(int item, int volume) { if (_sfxFileMap[item*2+0] != 0xFF) { - char filename[16]; assert(_sfxFileMap[item*2+0] < _sfxFileListSize); - snprintf(filename, 16, "%s", _sfxFileList[_sfxFileMap[item*2+0]]); + Common::String filename = Common::String::format("%s", _sfxFileList[_sfxFileMap[item*2+0]]); uint8 priority = _sfxFileMap[item*2+1]; - _soundDigital->playSound(filename, priority, Audio::Mixer::kSFXSoundType, volume); + _soundDigital->playSound(filename.c_str(), priority, Audio::Mixer::kSFXSoundType, volume); } } @@ -458,11 +456,10 @@ void KyraEngine_MR::playVoice(int high, int low) { } void KyraEngine_MR::snd_playVoiceFile(int file) { - char filename[16]; - snprintf(filename, 16, "%.08u", (uint)file); + Common::String filename = Common::String::format("%.08u", (uint)file); if (speechEnabled()) - _voiceSoundChannel = _soundDigital->playSound(filename, 0xFE, Audio::Mixer::kSpeechSoundType, 255); + _voiceSoundChannel = _soundDigital->playSound(filename.c_str(), 0xFE, Audio::Mixer::kSpeechSoundType, 255); } bool KyraEngine_MR::snd_voiceIsPlaying() { @@ -1242,26 +1239,14 @@ void KyraEngine_MR::restoreGfxRect32x32(int x, int y) { #pragma mark - -char *KyraEngine_MR::appendLanguage(char *buf, int lang, int bufSize) { - assert(lang < _languageExtensionSize); - - const int size = Common::strlcat(buf, _languageExtension[lang], bufSize); - if (size >= bufSize) { - warning("buffer too small to append language extension"); - return 0; - } - - return buf; -} - int KyraEngine_MR::loadLanguageFile(const char *file, uint8 *&buffer) { delete[] buffer; buffer = 0; uint32 size = 0; - char nBuf[32]; - Common::strlcpy(nBuf, file, sizeof(nBuf)); - buffer = _res->fileData(appendLanguage(nBuf, _lang, sizeof(nBuf)), &size); + Common::String nBuf = file; + nBuf += _languageExtension[_lang]; + buffer = _res->fileData(nBuf.c_str(), &size); return buffer ? size : 0; } diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h index 0d9d66ce95..b762648d29 100644 --- a/engines/kyra/kyra_mr.h +++ b/engines/kyra/kyra_mr.h @@ -662,8 +662,6 @@ private: static const char *_languageExtension[]; static const int _languageExtensionSize; - char *appendLanguage(char *buf, int lang, int bufSize); - int loadLanguageFile(const char *file, uint8 *&buffer); }; diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index f108082e13..f79fabf9eb 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -93,15 +93,6 @@ Common::Error KyraEngine_v1::init() { syncSoundSettings(); if (!_flags.useDigSound) { - // In Kyra 1 users who have specified a default MT-32 device in the launcher settings - // will get MT-32 music, otherwise AdLib. In Kyra 2 and LoL users who have specified a - // default GM device in the launcher will get GM music, otherwise AdLib. Users who want - // MT-32 music in Kyra2 or LoL have to select this individually (since we assume that - // most users rather have a GM device than a MT-32 device). - // Users who want PC speaker sound always have to select this individually for all - // Kyra games. - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_PCSPK | MDT_MIDI | MDT_ADLIB | ((_flags.gameID == GI_KYRA2 || _flags.gameID == GI_LOL) ? MDT_PREFER_GM : MDT_PREFER_MT32)); - if (_flags.platform == Common::kPlatformFMTowns) { if (_flags.gameID == GI_KYRA1) _sound = new SoundTowns(this, _mixer); @@ -114,43 +105,53 @@ Common::Error KyraEngine_v1::init() { _sound = new SoundTownsPC98_v2(this, _mixer); } else if (_flags.platform == Common::kPlatformAmiga) { _sound = new SoundAmiga(this, _mixer); - } else if (MidiDriver::getMusicType(dev) == MT_ADLIB) { - _sound = new SoundAdLibPC(this, _mixer); } else { - Sound::kType type; - const MusicType midiType = MidiDriver::getMusicType(dev); + // In Kyra 1 users who have specified a default MT-32 device in the launcher settings + // will get MT-32 music, otherwise AdLib. In Kyra 2 and LoL users who have specified a + // default GM device in the launcher will get GM music, otherwise AdLib. Users who want + // MT-32 music in Kyra2 or LoL have to select this individually (since we assume that + // most users rather have a GM device than a MT-32 device). + // Users who want PC speaker sound always have to select this individually for all + // Kyra games. + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_PCSPK | MDT_MIDI | MDT_ADLIB | ((_flags.gameID == GI_KYRA2 || _flags.gameID == GI_LOL) ? MDT_PREFER_GM : MDT_PREFER_MT32)); + if (MidiDriver::getMusicType(dev) == MT_ADLIB) { + _sound = new SoundAdLibPC(this, _mixer); + } else { + Sound::kType type; + const MusicType midiType = MidiDriver::getMusicType(dev); - if (midiType == MT_PCSPK || midiType == MT_NULL) - type = Sound::kPCSpkr; - else if (midiType == MT_MT32 || ConfMan.getBool("native_mt32")) - type = Sound::kMidiMT32; - else - type = Sound::kMidiGM; + if (midiType == MT_PCSPK || midiType == MT_NULL) + type = Sound::kPCSpkr; + else if (midiType == MT_MT32 || ConfMan.getBool("native_mt32")) + type = Sound::kMidiMT32; + else + type = Sound::kMidiGM; - MidiDriver *driver = 0; + MidiDriver *driver = 0; - if (MidiDriver::getMusicType(dev) == MT_PCSPK) { - driver = new MidiDriver_PCSpeaker(_mixer); - } else { - driver = MidiDriver::createMidi(dev); - if (type == Sound::kMidiMT32) - driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); - } + if (MidiDriver::getMusicType(dev) == MT_PCSPK) { + driver = new MidiDriver_PCSpeaker(_mixer); + } else { + driver = MidiDriver::createMidi(dev); + if (type == Sound::kMidiMT32) + driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); + } - assert(driver); + assert(driver); - SoundMidiPC *soundMidiPc = new SoundMidiPC(this, _mixer, driver, type); - _sound = soundMidiPc; - assert(_sound); + SoundMidiPC *soundMidiPc = new SoundMidiPC(this, _mixer, driver, type); + _sound = soundMidiPc; + assert(_sound); - // Unlike some SCUMM games, it's not that the MIDI sounds are - // missing. It's just that at least at the time of writing they - // are decidedly inferior to the AdLib ones. - if (ConfMan.getBool("multi_midi")) { - SoundAdLibPC *adlib = new SoundAdLibPC(this, _mixer); - assert(adlib); + // Unlike some SCUMM games, it's not that the MIDI sounds are + // missing. It's just that at least at the time of writing they + // are decidedly inferior to the AdLib ones. + if (ConfMan.getBool("multi_midi")) { + SoundAdLibPC *adlib = new SoundAdLibPC(this, _mixer); + assert(adlib); - _sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib); + _sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib); + } } } diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index bb533b14a5..5b4f3385a4 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -99,7 +99,7 @@ class KyraMetaEngine; * - The Legend of Kyrandia (fully supported, except for Macintosh port, which lacks sound) * - (The) Hand of Fate (fully supported) * - Malcolm's Revenge (fully supported) - * - Lands of Lore: The Throne of Chaos (completable, still work in progress) + * - Lands of Lore: The Throne of Chaos (fully supported) */ namespace Kyra { @@ -418,7 +418,7 @@ protected: void loadGameStateCheck(int slot); virtual Common::Error loadGameState(int slot) = 0; - Common::Error saveGameState(int slot, const char *saveName) { return saveGameStateIntern(slot, saveName, 0); } + Common::Error saveGameState(int slot, const Common::String &desc) { return saveGameStateIntern(slot, desc.c_str(), 0); } virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0; Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header); diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 9b0ae173d5..c567cbb037 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -42,9 +42,13 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy _gui = 0; _txt = 0; _tim = 0; - _animator = 0; - switch (_flags.lang) { + _lang = 0; + Common::Language lang = Common::parseLanguage(ConfMan.get("language")); + if (lang == _flags.fanLang && _flags.replacedLang != Common::UNK_LANG) + lang = _flags.replacedLang; + + switch (lang) { case Common::EN_ANY: case Common::EN_USA: case Common::EN_GRB: @@ -576,7 +580,6 @@ Common::Error LoLEngine::go() { _tim = new TIMInterpreter_LoL(this, _screen, _system); assert(_tim); - _animator = _tim->animator(); if (shouldQuit()) return Common::kNoError; @@ -613,11 +616,11 @@ void LoLEngine::preInit() { loadTalkFile(0); - char filename[32]; - snprintf(filename, sizeof(filename), "LANDS.%s", _languageExt[_lang]); - _res->exists(filename, true); + Common::String filename; + filename = Common::String::format("LANDS.%s", _languageExt[_lang]); + _res->exists(filename.c_str(), true); delete[] _landsFile; - _landsFile = _res->fileData(filename, 0); + _landsFile = _res->fileData(filename.c_str(), 0); loadItemIconShapes(); } @@ -1163,9 +1166,8 @@ void LoLEngine::loadCharFaceShapes(int charNum, int id) { if (id < 0) id = -id; - char file[13]; - snprintf(file, sizeof(file), "FACE%02d.SHP", id); - _screen->loadBitmap(file, 3, 3, 0); + Common::String file = Common::String::format("FACE%02d.SHP", id); + _screen->loadBitmap(file.c_str(), 3, 3, 0); const uint8 *p = _screen->getCPagePtr(3); for (int i = 0; i < 40; i++) { @@ -1811,29 +1813,26 @@ void LoLEngine::createTransparencyTables() { } void LoLEngine::updateSequenceBackgroundAnimations() { - if (_updateFlags & 8 || !_animator) + if (_updateFlags & 8 || !_tim) + return; + if (!_tim->animator()) return; for (int i = 0; i < 6; i++) - _animator->update(i); + _tim->animator()->update(i); } void LoLEngine::loadTalkFile(int index) { - char file[8]; - if (index == _curTlkFile) return; - if (_curTlkFile > 0 && index > 0) { - snprintf(file, sizeof(file), "%02d.TLK", _curTlkFile); - _res->unloadPakFile(file); - } + if (_curTlkFile > 0 && index > 0) + _res->unloadPakFile(Common::String::format("%02d.TLK", _curTlkFile)); if (index > 0) _curTlkFile = index; - snprintf(file, sizeof(file), "%02d.TLK", index); - _res->loadPakFile(file); + _res->loadPakFile(Common::String::format("%02d.TLK", index)); } int LoLEngine::characterSays(int track, int charId, bool redraw) { @@ -2702,12 +2701,11 @@ int LoLEngine::processMagicMistOfDoom(int charNum, int spellLevel) { snd_playSoundEffect(155, -1); - char wsafile[13]; - snprintf(wsafile, 13, "mists%0d.wsa", spellLevel + 1); + Common::String wsafile = Common::String::format("mists%0d.wsa", spellLevel + 1); WSAMovie_v2 *mov = new WSAMovie_v2(this); - mov->open(wsafile, 1, 0); + mov->open(wsafile.c_str(), 1, 0); if (!mov->opened()) - error("Mist: Unable to load mists.wsa"); + error("Mist: Unable to load %s", wsafile.c_str()); snd_playSoundEffect(_mistAnimData[spellLevel].sound, -1); playSpellAnimation(mov, _mistAnimData[spellLevel].part1First, _mistAnimData[spellLevel].part1Last, 7, 112, 0, 0, 0, 0, 0, false); @@ -2720,7 +2718,7 @@ int LoLEngine::processMagicMistOfDoom(int charNum, int spellLevel) { _screen->copyPage(12, 0); updateDrawPage2(); - this->snd_playQueuedEffects(); + snd_playQueuedEffects(); return 1; } @@ -2734,12 +2732,11 @@ int LoLEngine::processMagicLightning(int charNum, int spellLevel) { _lightningDiv = _lightningProps[spellLevel].frameDiv; _lightningFirstSfx = 0; - char wsafile[13]; - snprintf(wsafile, 13, "litning%d.wsa", spellLevel + 1); + Common::String wsafile = Common::String::format("litning%d.wsa", spellLevel + 1); WSAMovie_v2 *mov = new WSAMovie_v2(this); - mov->open(wsafile, 1, 0); + mov->open(wsafile.c_str(), 1, 0); if (!mov->opened()) - error("Litning: Unable to load litning.wsa"); + error("Litning: Unable to load %s", wsafile.c_str()); for (int i = 0; i < 4; i++) playSpellAnimation(mov, 0, _lightningProps[spellLevel].lastFrame, 3, 93, 0, &LoLEngine::callbackProcessMagicLightning, 0, 0, 0, false); @@ -3139,11 +3136,10 @@ void LoLEngine::transferSpellToScollAnimation(int charNum, int spell, int slot) int vX = _updateSpellBookCoords[slot << 1] + 32; int vY = _updateSpellBookCoords[(slot << 1) + 1] + 5; - char wsaFile[13]; + Common::String wsaFile = Common::String::format("write%0d", spell); if (_flags.isTalkie) - snprintf(wsaFile, 13, "write%0d%c.wsa", spell, (_lang == 1) ? 'f' : (_lang == 0 ? 'e' : 'g')); - else - snprintf(wsaFile, 13, "write%0d.wsa", spell); + wsaFile += (_lang == 1) ? 'f' : (_lang == 0 ? 'e' : 'g'); + wsaFile += ".wsa"; snd_playSoundEffect(_updateSpellBookAnimData[(spell << 2) + 3], -1); snd_playSoundEffect(95, -1); @@ -3187,7 +3183,7 @@ void LoLEngine::transferSpellToScollAnimation(int charNum, int spell, int slot) playSpellAnimation(mov, 0, 6, 5, _updateSpellBookCoords[slot << 1], _updateSpellBookCoords[(slot << 1) + 1], 0, 0, 0, 0, false); mov->close(); - mov->open(wsaFile, 0, 0); + mov->open(wsaFile.c_str(), 0, 0); if (!mov->opened()) error("SpellBook: Unable to load spellbook anim"); snd_playSoundEffect(_updateSpellBookAnimData[(spell << 2) + 3], -1); @@ -4160,10 +4156,9 @@ void LoLEngine::loadMapLegendData(int level) { legendData[i * 6 + 5] = 0xffff; } - char file[13]; + Common::String file = Common::String::format("level%d.xxx", level); uint32 size = 0; - snprintf(file, 12, "level%d.xxx", level); - uint8 *data = _res->fileData(file, &size); + uint8 *data = _res->fileData(file.c_str(), &size); uint8 *pos = data; size = MIN<uint32>(size / 12, 32); @@ -4531,10 +4526,9 @@ void LoLEngine::generateTempData() { _lvlTempData[l]->monsters = new MonsterInPlay[30]; _lvlTempData[l]->flyingObjects = new FlyingObject[8]; - char filename[13]; - snprintf(filename, sizeof(filename), "LEVEL%d.CMZ", _currentLevel); + Common::String filename = Common::String::format("LEVEL%d.CMZ", _currentLevel); - _screen->loadBitmap(filename, 15, 15, 0); + _screen->loadBitmap(filename.c_str(), 15, 15, 0); const uint8 *p = _screen->getCPagePtr(14); uint16 len = READ_LE_UINT16(p + 4); p += 6; diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index a815fa1a37..943bb7f8d5 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -315,7 +315,6 @@ private: GUI_LoL *_gui; TIMInterpreter *_tim; - TimAnimator *_animator; Common::Error init(); Common::Error go(); @@ -1215,7 +1214,7 @@ private: void setItemPosition(Item item, uint16 x, uint16 y, int flyingHeight, int b); 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 objectOnNextBlock); + void endObjectFlight(FlyingObject *t, int x, int y, int collisionObject); void processObjectFlight(FlyingObject *t, int x, int y); void updateObjectFlightPosition(FlyingObject *t); void objectFlightProcessHits(FlyingObject *t, int x, int y, int objectOnNextBlock); diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index 305036fc51..165919dff2 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -67,18 +67,17 @@ void LoLEngine::loadLevel(int index) { loadLevelWallData(index, true); _loadLevelFlag = 1; - char filename[13]; - snprintf(filename, sizeof(filename), "LEVEL%d.INI", index); + Common::String filename = Common::String::format("LEVEL%d.INI", index); int f = _hasTempDataFlags & (1 << (index - 1)); - runInitScript(filename, f ? 0 : 1); + runInitScript(filename.c_str(), f ? 0 : 1); if (f) restoreBlockTempData(index); - snprintf(filename, sizeof(filename), "LEVEL%d.INF", index); - runInfScript(filename); + filename = Common::String::format("LEVEL%d.INF", index); + runInfScript(filename.c_str()); addLevelItems(); deleteMonstersFromBlock(_currentBlock); @@ -142,11 +141,10 @@ void LoLEngine::assignBlockObject(LevelBlockProperty *l, uint16 item) { } void LoLEngine::loadLevelWallData(int index, bool mapShapes) { - char filename[13]; - snprintf(filename, sizeof(filename), "LEVEL%d.WLL", index); + Common::String filename = Common::String::format("LEVEL%d.WLL", index); uint32 size; - uint8 *file = _res->fileData(filename, &size); + uint8 *file = _res->fileData(filename.c_str(), &size); uint16 c = READ_LE_UINT16(file); loadLevelShpDat(_levelShpList[c], _levelDatList[c], false); @@ -241,10 +239,9 @@ void LoLEngine::restoreBlockTempData(int index) { memcpy(_monsters, _lvlTempData[l]->monsters, sizeof(MonsterInPlay) * 30); memcpy(_flyingObjects, _lvlTempData[l]->flyingObjects, sizeof(FlyingObject) * 8); - char filename[13]; - snprintf(filename, sizeof(filename), "LEVEL%d.CMZ", index); + Common::String filename = Common::String::format("LEVEL%d.CMZ", index); - _screen->loadBitmap(filename, 3, 3, 0); + _screen->loadBitmap(filename.c_str(), 3, 3, 0); const uint8 *p = _screen->getCPagePtr(2); uint16 len = READ_LE_UINT16(p + 4); p += 6; @@ -366,13 +363,13 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight _lastSpecialColor = 0x44; } - char fname[13]; + Common::String fname; const uint8 *v = 0; int tlen = 0; if (_flags.use16ColorMode) { - snprintf(fname, sizeof(fname), "%s.VCF", _lastBlockDataFile); - _screen->loadBitmap(fname, 3, 3, 0); + fname = Common::String::format("%s.VCF", _lastBlockDataFile); + _screen->loadBitmap(fname.c_str(), 3, 3, 0); v = _screen->getCPagePtr(2); tlen = READ_LE_UINT16(v) << 5; v += 2; @@ -383,8 +380,8 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight memcpy(_vcfBlocks, v, tlen); } - snprintf(fname, sizeof(fname), "%s.VCN", _lastBlockDataFile); - _screen->loadBitmap(fname, 3, 3, 0); + fname = Common::String::format("%s.VCN", _lastBlockDataFile); + _screen->loadBitmap(fname.c_str(), 3, 3, 0); v = _screen->getCPagePtr(2); tlen = READ_LE_UINT16(v); v += 2; @@ -434,8 +431,8 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight memcpy(_vcnBlocks, v, vcnLen); v += vcnLen; - snprintf(fname, sizeof(fname), "%s.VMP", _lastBlockDataFile); - _screen->loadBitmap(fname, 3, 3, 0); + fname = Common::String::format("%s.VMP", _lastBlockDataFile); + _screen->loadBitmap(fname.c_str(), 3, 3, 0); v = _screen->getCPagePtr(2); if (vmpLen == -1) @@ -503,9 +500,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight generateBrightnessPalette(_screen->getPalette(0), _screen->getPalette(1), _brightness, _lampEffect); if (_flags.isTalkie) { - char tname[13]; - snprintf(tname, sizeof(tname), "LEVEL%.02d.TLC", _currentLevel); - Common::SeekableReadStream *s = _res->createReadStream(tname); + Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("LEVEL%.02d.TLC", _currentLevel)); s->read(_transparencyTable1, 256); s->read(_transparencyTable2, 5120); delete s; @@ -1375,9 +1370,8 @@ void LoLEngine::processGasExplosion(int soundId) { if (dist) { WSAMovie_v2 *mov = new WSAMovie_v2(this); - char file[13]; - snprintf(file, 13, "gasexp%0d.wsa", dist); - mov->open(file, 1, 0); + Common::String file = Common::String::format("gasexp%0d.wsa", dist); + mov->open(file.c_str(), 1, 0); if (!mov->opened()) error("Gas: Unable to load gasexp.wsa"); diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index 2261ef8389..695528b8d1 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -524,7 +524,7 @@ int LoLEngine::olol_initAnimStruct(EMCState *script) { int LoLEngine::olol_playAnimationPart(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_playAnimationPart(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); - _animator->playPart(stackPos(0), stackPos(1), stackPos(2), stackPos(3)); + _tim->animator()->playPart(stackPos(0), stackPos(1), stackPos(2), stackPos(3)); return 1; } @@ -593,13 +593,13 @@ int LoLEngine::olol_clearDialogueField(EMCState *script) { int LoLEngine::olol_setupBackgroundAnimationPart(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_setupBackgroundAnimationPart(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9)); - _animator->setupPart(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9)); + _tim->animator()->setupPart(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9)); return 0; } int LoLEngine::olol_startBackgroundAnimation(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_startBackgroundAnimation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); - _animator->start(stackPos(0), stackPos(1)); + _tim->animator()->start(stackPos(0), stackPos(1)); return 1; } @@ -629,7 +629,7 @@ int LoLEngine::olol_loadBitmap(EMCState *script) { int LoLEngine::olol_stopBackgroundAnimation(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_stopBackgroundAnimation(%p) (%d)", (const void *)script, stackPos(0)); - _animator->stop(stackPos(0)); + _tim->animator()->stop(stackPos(0)); return 1; } @@ -1136,9 +1136,8 @@ int LoLEngine::olol_loadTimScript(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_loadTimScript(%p) (%d, %s)", (const void *)script, stackPos(0), stackPosString(1)); if (_activeTim[stackPos(0)]) return 1; - char file[13]; - snprintf(file, sizeof(file), "%s.TIM", stackPosString(1)); - _activeTim[stackPos(0)] = _tim->load(file, &_timIngameOpcodes); + Common::String file = Common::String::format("%s.TIM", stackPosString(1)); + _activeTim[stackPos(0)] = _tim->load(file.c_str(), &_timIngameOpcodes); return 1; } @@ -1185,10 +1184,9 @@ int LoLEngine::olol_giveItemToMonster(EMCState *script) { int LoLEngine::olol_loadLangFile(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_loadLangFile(%p) (%s)", (const void *)script, stackPosString(0)); - char filename[13]; - snprintf(filename, sizeof(filename), "%s.%s", stackPosString(0), _languageExt[_lang]); + Common::String filename = Common::String::format("%s.%s", stackPosString(0), _languageExt[_lang]); delete[] _levelLangFile; - _levelLangFile = _res->fileData(filename, 0); + _levelLangFile = _res->fileData(filename.c_str(), 0); return 1; } @@ -1440,7 +1438,10 @@ int LoLEngine::olol_playEndSequence(EMCState *script){ _screen->getPalette(1).clear(); showOutro(c, (_monsterDifficulty == 2)); - quitGame(); + // Don't call quitGame() on a RTL request (because this would + // make the next game launched from the launcher quit instantly. + if (!shouldQuit()) + quitGame(); return 0; } @@ -1983,7 +1984,7 @@ int LoLEngine::olol_removeInventoryItem(EMCState *script) { int LoLEngine::olol_getAnimationLastPart(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_getAnimationLastPart(%p) (%d)", (const void *)script, stackPos(0)); - return _animator->resetLastPart(stackPos(0)); + return _tim->animator()->resetLastPart(stackPos(0)); } int LoLEngine::olol_assignSpecialGuiShape(EMCState *script) { @@ -2406,16 +2407,16 @@ int LoLEngine::tlol_processWsaFrame(const TIM *tim, const uint16 *param) { const int y2 = param[3]; const int factor = MAX<int>(0, (int16)param[4]); - const int x1 = _animator->getAnimX(animIndex); - const int y1 = _animator->getAnimY(animIndex); - const Movie *wsa = _animator->getWsaCPtr(animIndex); + const int x1 = _tim->animator()->getAnimX(animIndex); + const int y1 = _tim->animator()->getAnimY(animIndex); + const Movie *wsa = _tim->animator()->getWsaCPtr(animIndex); int w1 = wsa->width(); int h1 = wsa->height(); int w2 = (w1 * factor) / 100; int h2 = (h1 * factor) / 100; - _animator->displayFrame(animIndex, 2, frame); + _tim->animator()->displayFrame(animIndex, 2, frame); _screen->wsaFrameAnimationStep(x1, y1, x2, y2, w1, h1, w2, h2, 2, _flags.isDemo && _flags.platform != Common::kPlatformPC98 ? 0 : 8, 0); if (!_flags.isDemo && _flags.platform != Common::kPlatformPC98) _screen->checkedPageUpdate(8, 4); @@ -2584,13 +2585,13 @@ int LoLEngine::tlol_playSoundEffect(const TIM *tim, const uint16 *param) { int LoLEngine::tlol_startBackgroundAnimation(const TIM *tim, const uint16 *param) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_startBackgroundAnimation(%p, %p) (%d, %d)", (const void *)tim, (const void *)param, param[0], param[1]); - _animator->start(param[0], param[1]); + _tim->animator()->start(param[0], param[1]); return 1; } int LoLEngine::tlol_stopBackgroundAnimation(const TIM *tim, const uint16 *param) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_stopBackgroundAnimation(%p, %p) (%d)", (const void *)tim, (const void *)param, param[0]); - _animator->stop(param[0]); + _tim->animator()->stop(param[0]); return 1; } @@ -2674,12 +2675,12 @@ int LoLEngine::tlol_displayAnimFrame(const TIM *tim, const uint16 *param) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_displayAnimFrame(%p, %p) (%d, %d)", (const void *)tim, (const void *)param, param[0], param[1]); const int animIndex = tim->wsa[param[0]].anim - 1; - const Movie *wsa = _animator->getWsaCPtr(animIndex); + const Movie *wsa = _tim->animator()->getWsaCPtr(animIndex); if (param[1] == 0xFFFF) { _screen->copyRegion(0, 0, 0, 0, 320, 200, 0, 2, Screen::CR_NO_P_CHECK); } else { - _animator->displayFrame(animIndex, 2, param[1], 0); + _tim->animator()->displayFrame(animIndex, 2, param[1], 0); _screen->copyRegion(wsa->xAdd(), wsa->yAdd(), wsa->xAdd(), wsa->yAdd(), wsa->width(), wsa->height(), 2, 0); } diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 501ae2defd..6f0f0ab083 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -482,17 +482,16 @@ int TIMInterpreter::initAnimStruct(int index, const char *filename, int x, int y wsaOpenFlags = 1; } - char file[32]; - snprintf(file, 32, "%s.WSA", filename); + Common::String file = Common::String::format("%s.WSA", filename); - if (_vm->resource()->exists(file)) { + if (_vm->resource()->exists(file.c_str())) { if (isLoLDemo) wsa = new WSAMovie_v1(_vm); else wsa = new WSAMovie_v2(_vm); assert(wsa); - wsa->open(file, wsaOpenFlags, (index == 1) ? &_screen->getPalette(0) : 0); + wsa->open(file.c_str(), wsaOpenFlags, (index == 1) ? &_screen->getPalette(0) : 0); } if (wsa && wsa->opened()) { @@ -526,10 +525,10 @@ int TIMInterpreter::initAnimStruct(int index, const char *filename, int x, int y } if (wsaFlags & 4) { - snprintf(file, 32, "%s.CPS", filename); + file = Common::String::format("%s.CPS", filename); - if (_vm->resource()->exists(file)) { - _screen->loadBitmap(file, 3, 3, &_screen->getPalette(0)); + if (_vm->resource()->exists(file.c_str())) { + _screen->loadBitmap(file.c_str(), 3, 3, &_screen->getPalette(0)); _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, _drawPage2, Screen::CR_NO_P_CHECK); if (_drawPage2) _screen->checkedPageUpdate(8, 4); @@ -550,10 +549,10 @@ int TIMInterpreter::initAnimStruct(int index, const char *filename, int x, int y _screen->updateScreen(); } - snprintf(file, 32, "%s.CPS", filename); + file = Common::String::format("%s.CPS", filename); - if (_vm->resource()->exists(file)) { - _screen->loadBitmap(file, 3, 3, &_screen->getPalette(0)); + if (_vm->resource()->exists(file.c_str())) { + _screen->loadBitmap(file.c_str(), 3, 3, &_screen->getPalette(0)); _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, _drawPage2, Screen::CR_NO_P_CHECK); if (_drawPage2) _screen->checkedPageUpdate(8, 4); @@ -922,13 +921,12 @@ int TIMInterpreter_LoL::initAnimStruct(int index, const char *filename, int x, i if (wsaFlags & 8) wsaOpenFlags |= 1; - char file[32]; - snprintf(file, 32, "%s.WSA", filename); + Common::String file = Common::String::format("%s.WSA", filename); - if (_vm->resource()->exists(file)) { + if (_vm->resource()->exists(file.c_str())) { wsa = new WSAMovie_v2(_vm); assert(wsa); - wsa->open(file, wsaOpenFlags, &_screen->getPalette(3)); + wsa->open(file.c_str(), wsaOpenFlags, &_screen->getPalette(3)); } if (!_vm->_flags.use16ColorMode) { diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index d11403ad9f..01bf3c5e26 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -202,8 +202,7 @@ void LoLEngine::setupPrologueData(bool load) { void LoLEngine::showIntro() { _tim = new TIMInterpreter(this, _screen, _system); assert(_tim); - _animator = _tim->animator(); - + if (_flags.platform == Common::kPlatformPC98) showStarcraftLogo(); @@ -262,7 +261,6 @@ void LoLEngine::showIntro() { delete _tim; _tim = 0; - _animator = 0; _screen->fadePalette(_screen->getPalette(1), 30, 0); } @@ -270,7 +268,6 @@ void LoLEngine::showIntro() { int LoLEngine::chooseCharacter() { _tim = new TIMInterpreter(this, _screen, _system); assert(_tim); - _animator = _tim->animator(); _tim->setLangData("LOLINTRO.DIP"); @@ -309,9 +306,8 @@ int LoLEngine::chooseCharacter() { Screen::FontId old = _screen->setFont(Screen::FID_SJIS_FNT); for (int j = 0; j < 3; ++j) { - char buffer[3]; - snprintf(buffer, sizeof(buffer), "%2d", _charPreviews[i].attrib[j]); - _screen->printText(buffer, _charPosXPC98[i] + 16, 176 + j * 8, 0x81, 0x00); + Common::String attribString = Common::String::format("%2d", _charPreviews[i].attrib[j]); + _screen->printText(attribString.c_str(), _charPosXPC98[i] + 16, 176 + j * 8, 0x81, 0x00); } _screen->setFont(old); } @@ -387,7 +383,6 @@ int LoLEngine::chooseCharacter() { delete _tim; _tim = 0; - _animator = 0; return _charSelection; } @@ -1061,7 +1056,6 @@ void LoLEngine::showOutro(int character, bool maxDifficulty) { setupEpilogueData(true); TIMInterpreter *timBackUp = _tim; _tim = new TIMInterpreter(this, _screen, _system); - _animator = _tim->animator(); _screen->getPalette(0).clear(); _screen->setScreenPalette(_screen->getPalette(0)); @@ -1117,47 +1111,49 @@ void LoLEngine::showOutro(int character, bool maxDifficulty) { _screen->fadeToBlack(30); - showCredits(); + if (!shouldQuit()) + showCredits(); _eventList.clear(); + + if (!shouldQuit()) { + switch (character) { + case 0: + _screen->loadBitmap("KIERAN.CPS", 3, 3, &_screen->getPalette(0)); + break; - switch (character) { - case 0: - _screen->loadBitmap("KIERAN.CPS", 3, 3, &_screen->getPalette(0)); - break; - - case 1: - _screen->loadBitmap("AK'SHEL.CPS", 3, 3, &_screen->getPalette(0)); - break; + case 1: + _screen->loadBitmap("AK'SHEL.CPS", 3, 3, &_screen->getPalette(0)); + break; - case 2: - _screen->loadBitmap("MICHAEL.CPS", 3, 3, &_screen->getPalette(0)); - break; + case 2: + _screen->loadBitmap("MICHAEL.CPS", 3, 3, &_screen->getPalette(0)); + break; - case 3: - _screen->loadBitmap("CONRAD.CPS", 3, 3, &_screen->getPalette(0)); - break; + case 3: + _screen->loadBitmap("CONRAD.CPS", 3, 3, &_screen->getPalette(0)); + break; - default: - _screen->clearPage(3); - _screen->getPalette(0).clear(); - } + default: + _screen->clearPage(3); + _screen->getPalette(0).clear(); + } - _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK); - if (maxDifficulty && !_flags.use16ColorMode) - _tim->displayText(0x8000, 0, 0xDC); - _screen->updateScreen(); - _screen->fadePalette(_screen->getPalette(0), 30, 0); + _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK); + if (maxDifficulty && !_flags.use16ColorMode) + _tim->displayText(0x8000, 0, 0xDC); + _screen->updateScreen(); + _screen->fadePalette(_screen->getPalette(0), 30, 0); - while (!checkInput(0) && !shouldQuit()) - delay(_tickLength); + while (!checkInput(0) && !shouldQuit()) + delay(_tickLength); - _screen->fadeToBlack(30); + _screen->fadeToBlack(30); + } _tim->clearLangData(); delete _tim; _tim = timBackUp; - _animator = 0; setupEpilogueData(false); } @@ -1245,7 +1241,7 @@ void LoLEngine::processCredits(char *t, int dimState, int page, int delayTime) { int curShapeFile = 0; uint8 *shapes[12]; - memset(&shapes, 0, sizeof(shapes)); + memset(shapes, 0, sizeof(shapes)); loadOutroShapes(curShapeFile++, shapes); uint8 *monsterPal = 0; diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp index 95a632c08c..b2a9c2fd93 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound_lok.cpp @@ -74,9 +74,8 @@ void KyraEngine_LoK::snd_playWanderScoreViaMap(int command, int restart) { } void KyraEngine_LoK::snd_playVoiceFile(int id) { - char vocFile[9]; - snprintf(vocFile, sizeof(vocFile), "%03d", id); - _speechPlayTime = _sound->voicePlay(vocFile, &_speechHandle); + Common::String vocFile = Common::String::format("%03d", id); + _speechPlayTime = _sound->voicePlay(vocFile.c_str(), &_speechHandle); } void KyraEngine_LoK::snd_voiceWaitForFinish(bool ingame) { diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index a7776f0ab6..7262635728 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -50,36 +50,34 @@ bool LoLEngine::snd_playCharacterSpeech(int id, int8 speaker, int) { _lastSpeaker = speaker; _nextSpeechId = _nextSpeaker = -1; - char pattern1[8]; - char pattern2[5]; - char file1[13]; - char file2[13]; - char file3[13]; - file3[0] = 0; + Common::String pattern1; + Common::String file1; + Common::String file2; + Common::String file3; SpeechList newSpeechList; - snprintf(pattern2, sizeof(pattern2), "%02d", id & 0x4000 ? 0 : _curTlkFile); + Common::String pattern2 = Common::String::format("%02d", id & 0x4000 ? 0 : _curTlkFile); if (id & 0x4000) { - snprintf(pattern1, sizeof(pattern1), "%03X", id & 0x3fff); + pattern1 = Common::String::format("%03X", id & 0x3fff); } else if (id < 1000) { - snprintf(pattern1, sizeof(pattern1), "%03d", id); + pattern1 = Common::String::format("%03d", id); } else { - snprintf(file3, sizeof(file3), "@%04d%c.%s", id - 1000, (char)speaker, pattern2); - if (_sound->isVoicePresent(file3)) - newSpeechList.push_back(_sound->getVoiceStream(file3)); + file3 = Common::String::format("@%04d%c.%s", id - 1000, (char)speaker, pattern2.c_str()); + if (_sound->isVoicePresent(file3.c_str())) + newSpeechList.push_back(_sound->getVoiceStream(file3.c_str())); } - if (!file3[0]) { + if (file3.empty()) { for (char i = 0; ; i++) { char symbol = '0' + i; - snprintf(file1, sizeof(file1), "%s%c%c.%s", pattern1, (char)speaker, symbol, pattern2); - snprintf(file2, sizeof(file2), "%s%c%c.%s", pattern1, '_', symbol, pattern2); - if (_sound->isVoicePresent(file1)) - newSpeechList.push_back(_sound->getVoiceStream(file1)); - else if (_sound->isVoicePresent(file2)) - newSpeechList.push_back(_sound->getVoiceStream(file2)); + file1 = Common::String::format("%s%c%c.%s", pattern1.c_str(), (char)speaker, symbol, pattern2.c_str()); + file2 = Common::String::format("%s%c%c.%s", pattern1.c_str(), '_', symbol, pattern2.c_str()); + if (_sound->isVoicePresent(file1.c_str())) + newSpeechList.push_back(_sound->getVoiceStream(file1.c_str())); + else if (_sound->isVoicePresent(file2.c_str())) + newSpeechList.push_back(_sound->getVoiceStream(file2.c_str())); else break; } @@ -260,9 +258,7 @@ void LoLEngine::snd_loadSoundFile(int track) { int t = (track - 250) * 3; if (_curMusicFileIndex != _musicTrackMap[t] || _curMusicFileExt != (char)_musicTrackMap[t + 1]) { snd_stopMusic(); - char filename[13]; - snprintf(filename, sizeof(filename), "LORE%02d%c", _musicTrackMap[t], (char)_musicTrackMap[t + 1]); - _sound->loadSoundFile(filename); + _sound->loadSoundFile(Common::String::format("LORE%02d%c", _musicTrackMap[t], (char)_musicTrackMap[t + 1])); _curMusicFileIndex = _musicTrackMap[t]; _curMusicFileExt = (char)_musicTrackMap[t + 1]; } else { diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 499cc6f301..d56abc5d47 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -38,7 +38,7 @@ namespace Kyra { -#define RESFILE_VERSION 73 +#define RESFILE_VERSION 74 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index 393fa8d11f..4406f3ec41 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -436,15 +436,16 @@ void KyraEngine_HoF::updateDlgBuffer() { _npcTalkChpIndex = _currentChapter; _npcTalkDlgIndex = _mainCharacter.dlgIndex; - char filename[13]; - snprintf(filename, 13, "CH%.02d-S%.02d.DLG", _currentChapter, _npcTalkDlgIndex); + Common::String filename = Common::String::format("CH%.02d-S%.02d.DL", _currentChapter, _npcTalkDlgIndex); const char *suffix = _flags.isTalkie ? suffixTalkie : suffixTowns; if (_flags.platform != Common::kPlatformPC || _flags.isTalkie) - filename[11] = suffix[_lang]; + filename += suffix[_lang]; + else + filename += 'G'; delete[] _dlgBuffer; - _dlgBuffer = _res->fileData(filename, 0); + _dlgBuffer = _res->fileData(filename.c_str(), 0); } void KyraEngine_HoF::loadDlgHeader(int &csEntry, int &vocH, int &scIndex1, int &scIndex2) { diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 2cb752fdb3..d690b70266 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -625,24 +625,20 @@ void KyraEngine_MR::malcolmSceneStartupChat() { } void KyraEngine_MR::updateDlgBuffer() { - char dlgFile[16]; - char cnvFile[16]; - if (_cnvFile) _cnvFile->seek(0, SEEK_SET); if (_curDlgIndex == _mainCharacter.dlgIndex && _curDlgChapter == _currentChapter && _curDlgLang == _lang) return; - snprintf(dlgFile, 16, "CH%.02d-S%.02d.", _currentChapter, _mainCharacter.dlgIndex); - appendLanguage(dlgFile, _lang, 16); - snprintf(cnvFile, 16, "CH%.02d-S%.02d.CNV", _currentChapter, _mainCharacter.dlgIndex); + Common::String dlgFile = Common::String::format("CH%.02d-S%.02d.%s", _currentChapter, _mainCharacter.dlgIndex, _languageExtension[_lang]); + Common::String cnvFile = Common::String::format("CH%.02d-S%.02d.CNV", _currentChapter, _mainCharacter.dlgIndex); delete _cnvFile; delete _dlgBuffer; - _res->exists(cnvFile, true); - _res->exists(dlgFile, true); + _res->exists(cnvFile.c_str(), true); + _res->exists(dlgFile.c_str(), true); _cnvFile = _res->createReadStream(cnvFile); _dlgBuffer = _res->createReadStream(dlgFile); assert(_cnvFile); diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp index 8ce73993c3..1cbf7672d1 100644 --- a/engines/lastexpress/data/animation.cpp +++ b/engines/lastexpress/data/animation.cpp @@ -94,7 +94,7 @@ bool Animation::load(Common::SeekableReadStream *stream, int flag) { } _currentChunk = _chunks.begin(); _changed = false; - _startTime = g_engine->_system->getMillis(); + _startTime = g_system->getMillis(); return true; } @@ -110,7 +110,7 @@ bool Animation::process() { // - Re-implement to be closer to the original engine // - Add support for subtitles // - Use engine sound queue instead of our own appendable sound instance - int32 currentFrame = (g_engine->_system->getMillis() - _startTime) * 3 / 100; + int32 currentFrame = (g_system->getMillis() - _startTime) * 3 / 100; // Process all chunks until the current frame while (!_changed && _currentChunk != NULL && currentFrame > _currentChunk->frame && !hasEnded()) { @@ -180,7 +180,7 @@ bool Animation::process() { // Synchronize the audio by resetting the start time if (_currentChunk->frame == 0) - _startTime = g_engine->_system->getMillis(); + _startTime = g_system->getMillis(); break; case kChunkTypeAudioEnd: @@ -260,7 +260,8 @@ void Animation::processChunkAudio(Common::SeekableReadStream *in, const Chunk &c // TODO: this method will probably go away and be integrated in the main loop void Animation::play() { - while (!hasEnded() && !g_engine->getEventManager()->shouldQuit() && !g_engine->getEventManager()->shouldRTL()) { + Common::EventManager *eventMan = g_system->getEventManager(); + while (!hasEnded() && !Engine::shouldQuit()) { process(); if (_changed) { @@ -283,11 +284,11 @@ void Animation::play() { g_system->updateScreen(); //FIXME: implement subtitles - g_engine->_system->delayMillis(20); + g_system->delayMillis(20); // Handle right-click to interrupt animations Common::Event ev = Common::Event(); - while (g_engine->getEventManager()->pollEvent(ev)) { + while (eventMan->pollEvent(ev)) { if (ev.type == Common::EVENT_RBUTTONUP) { // Stop audio if (_audio) diff --git a/engines/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp index e1bd9494a9..4b7c5f6a9a 100644 --- a/engines/lastexpress/debug.cpp +++ b/engines/lastexpress/debug.cpp @@ -865,7 +865,7 @@ bool Debugger::cmdBeetle(int argc, const char **argv) { askForRedraw(); redrawScreen(); - while (g_engine->getEventManager()->pollEvent(ev)) { + while (g_system->getEventManager()->pollEvent(ev)) { switch (ev.type) { default: diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 7c7c6b0a36..bf575b63f8 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -21,6 +21,7 @@ */ #include "lastexpress/lastexpress.h" +#include "engines/advancedDetector.h" namespace LastExpress { @@ -176,35 +177,13 @@ static const ADGameDescription gameDescriptions[] = { AD_TABLE_END_MARKER }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)gameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - lastExpressGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "lastexpress", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class LastExpressMetaEngine : public AdvancedMetaEngine { public: - LastExpressMetaEngine() : AdvancedMetaEngine(detectionParams) {} + LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { + params.singleid = "lastexpress"; + params.guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; + } const char *getName() const { return "Lastexpress"; @@ -224,6 +203,10 @@ bool LastExpressMetaEngine::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } +bool LastExpressEngine::isDemo() const { + return (bool)(_gameDescription->flags & ADGF_DEMO); +} + } // End of namespace LastExpress #if PLUGIN_ENABLED_DYNAMIC(LASTEXPRESS) diff --git a/engines/lastexpress/game/sound.cpp b/engines/lastexpress/game/sound.cpp index 63efd182a8..3f98ac79ea 100644 --- a/engines/lastexpress/game/sound.cpp +++ b/engines/lastexpress/game/sound.cpp @@ -699,7 +699,6 @@ bool SoundManager::playSoundWithSubtitles(Common::String filename, FlagType flag } void SoundManager::playSoundEvent(EntityIndex entity, byte action, byte a3) { - char filename[12]; int values[5]; if (getEntityData(entity)->car != getEntityData(kEntityPlayer)->car) @@ -842,7 +841,6 @@ void SoundManager::playSteam(CityIndex index) { void SoundManager::playFightSound(byte action, byte a4) { int _action = (int)action; - char filename[12]; int values[5]; switch (action) { diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp index 6fdd18413b..e162998719 100644 --- a/engines/lastexpress/lastexpress.cpp +++ b/engines/lastexpress/lastexpress.cpp @@ -37,6 +37,8 @@ #include "common/config-manager.h" #include "common/debug-channels.h" +#include "common/error.h" +#include "common/fs.h" #include "engines/util.h" diff --git a/engines/lastexpress/lastexpress.h b/engines/lastexpress/lastexpress.h index d78bba36f0..f8f38788a0 100644 --- a/engines/lastexpress/lastexpress.h +++ b/engines/lastexpress/lastexpress.h @@ -29,11 +29,12 @@ #include "common/random.h" #include "common/timer.h" -#include "engines/advancedDetector.h" #include "engines/engine.h" #include "graphics/pixelformat.h" +struct ADGameDescription; + /** * This is the namespace of the LastExpress engine. * @@ -101,7 +102,7 @@ public: void restoreEventHandlers(); void setEventHandlers(EventHandler::EventFunction *eventMouse, EventHandler::EventFunction *eventTick); - bool isDemo() const { return (bool)(_gameDescription->flags & ADGF_DEMO); } + bool isDemo() const; // Frame Counter uint32 getFrameCounter() { return _frameCounter; } diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index ced0be0cfb..83ede92569 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -175,34 +175,14 @@ static const LureGameDescription gameDescriptions[] = { } // End of namespace Lure -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Lure::gameDescriptions, - // Size of that superset structure - sizeof(Lure::LureGameDescription), - // Number of bytes to compute MD5 sum for - 1024, - // List of all engine targets - lureGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "lure", - // List of files for file-based fallback detection (optional) - 0, - // Flags - kADFlagUseExtraAsHint, - // Additional GUI options (for every game} - Common::GUIO_NOSPEECH, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class LureMetaEngine : public AdvancedMetaEngine { public: - LureMetaEngine() : AdvancedMetaEngine(detectionParams) {} + LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) { + params.md5Bytes = 1024; + params.singleid = "lure"; + params.flags = kADFlagUseExtraAsHint; + params.guioptions = Common::GUIO_NOSPEECH; + } virtual const char *getName() const { return "Lure"; diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp index 1aefe3d02d..bab17d9e1d 100644 --- a/engines/m4/detection.cpp +++ b/engines/m4/detection.cpp @@ -384,34 +384,14 @@ static const char *directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)M4::gameDescriptions, - // Size of that superset structure - sizeof(M4::M4GameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - m4Games, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "m4", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOMIDI, - // Maximum directory depth - 2, - // List of directory globs - directoryGlobs -}; - class M4MetaEngine : public AdvancedMetaEngine { public: - M4MetaEngine() : AdvancedMetaEngine(detectionParams) {} + M4MetaEngine() : AdvancedMetaEngine(M4::gameDescriptions, sizeof(M4::M4GameDescription), m4Games) { + params.singleid = "m4"; + params.guioptions = Common::GUIO_NOMIDI; + params.depth = 2; + params.directoryGlobs = directoryGlobs; + } virtual const char *getName() const { return "MADS/M4"; diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index 4576e2b5ce..a0576a458e 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -525,34 +525,11 @@ static MadeGameDescription g_fallbackDesc = { } // End of namespace Made -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Made::gameDescriptions, - // Size of that superset structure - sizeof(Made::MadeGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - madeGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "made", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class MadeMetaEngine : public AdvancedMetaEngine { public: - MadeMetaEngine() : AdvancedMetaEngine(detectionParams) {} + MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { + params.singleid = "made"; + } virtual const char *getName() const { return "MADE"; diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 6a73b28246..a7442729d2 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -158,35 +158,14 @@ static const char *directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Mohawk::gameDescriptions, - // Size of that superset structure - sizeof(Mohawk::MohawkGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - mohawkGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "mohawk", - // List of files for file-based fallback detection (optional) - Mohawk::fileBased, - // Flags - 0, - // Additional GUI options (for every game) - Common::GUIO_NONE, - // Maximum directory depth - 2, - // List of directory globs - directoryGlobs -}; - class MohawkMetaEngine : public AdvancedMetaEngine { public: - MohawkMetaEngine() : AdvancedMetaEngine(detectionParams) {} - + MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) { + params.singleid = "mohawk"; + params.fileBasedFallback = Mohawk::fileBased; + params.depth = 2; + params.directoryGlobs = directoryGlobs; + } virtual const char *getName() const { return "Mohawk"; } diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h index 5510643d04..df66c3dc1c 100644 --- a/engines/mohawk/detection_tables.h +++ b/engines/mohawk/detection_tables.h @@ -527,7 +527,7 @@ static const MohawkGameDescription gameDescriptions[] = { "harryhh", "", AD_ENTRY1("HHHB.LB", "267bb6e3c8f237ca98b02c07b9c4013f"), - Common::EN_ANY, + Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, Common::GUIO_NONE @@ -573,6 +573,54 @@ static const MohawkGameDescription gameDescriptions[] = { 0 }, + // From afholman in bug#3309308 + { + { + "harryhh", + "", + AD_ENTRY1("EnglishBO", "b63a7b67834de0cd4cdbf02cf40d8547"), + Common::EN_GRB, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "harryhh", + "", + AD_ENTRY1("GermanBO", "eb740102c1c8379c2c610cba14484ccb"), + Common::DE_DEU, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "harryhh", + "", + AD_ENTRY1("FrenchBO", "2118de914ab9eaec482c245c06145071"), + Common::FR_FRA, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + // Harry and the Haunted House 1.1 // From pacifist { @@ -866,6 +914,54 @@ static const MohawkGameDescription gameDescriptions[] = { "TORTOISE.EXE" }, + // From afholman in bug#3309308 + { + { + "tortoise", + "", + AD_ENTRY1("TORTB.LB", "83f6bfcf30c445d13e81e0faed9aa27b"), + Common::EN_GRB, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0, + }, + + // From afholman in bug#3309308 + { + { + "tortoise", + "", + AD_ENTRY1("TORTD.LB", "21761e7de4e5f12298f43fa17c00f3e1"), + Common::DE_DEU, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0, + }, + + // From afholman in bug#3309308 + { + { + "tortoise", + "", + AD_ENTRY1("TORTF.LB", "9693043df217ffc0667a1f45f2849aa7"), + Common::FR_FRA, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0, + }, + { { "tortoise", @@ -942,6 +1038,38 @@ static const MohawkGameDescription gameDescriptions[] = { "ARTHUR.EXE" }, + // From afholman in bug#3309308 + { + { + "arthur", + "", + AD_ENTRY1("BookOutline", "133750de1ceb9e7351599d79f99fee4d"), + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV1, + GF_LB_10, + "Arthur's Teacher Trouble" + }, + + // From darthbo in bug#3301791 + { + { + "arthur", + "", + AD_ENTRY1("PAGES.512", "cd995d20d0d7b4642476fd76044b4e5b"), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV1, + GF_LB_10, + "ARTHUR.EXE" + }, + { { "arthur", @@ -1145,6 +1273,22 @@ static const MohawkGameDescription gameDescriptions[] = { "RUFF.EXE" }, + // From aluff in bug#3307785 + { + { + "ruff", + "", + AD_ENTRY1("BookOutline", "f625d4056c750b9aad6f94dd854f5abe"), + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV1, + 0, + "Living Books Player" + }, + { { "ruff", @@ -1191,6 +1335,38 @@ static const MohawkGameDescription gameDescriptions[] = { "Living Books Player" }, + // From aluff in bug#3309981 + { + { + "newkid", + "", + AD_ENTRY1("NEWKID.512", "5135f24afa138ecdf5b52d955e9a9189"), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV1, + 0, + "NEWKID.EXE" + }, + + // From aluff in bug#3309981 + { + { + "newkid", + "", + AD_ENTRY1("BookOutline", "6aa7c4720b922f4164584956be5ba9e5"), + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV1, + 0, + "Living Books Player" + }, + { { "newkid", @@ -1299,6 +1475,22 @@ static const MohawkGameDescription gameDescriptions[] = { "BIRTHDAY.EXE" }, + // From aluff in bug#3309936 + { + { + "arthurbday", + "", + AD_ENTRY1("BookOutline", "d631242b004720ecc615e4f855825860"), + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV1, + 0, + "Living Books Player" + }, + { { "arthurbday", @@ -1375,6 +1567,102 @@ static const MohawkGameDescription gameDescriptions[] = { "Little Monster at School" }, + // From afholman in bug#3309308 + { + { + "lilmonster", + "", + AD_ENTRY1("lmasb.lb", "18a4e82f2c5cc30f7a2f9bd95e8c1364"), + Common::EN_GRB, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "lilmonster", + "", + AD_ENTRY1("lmasd.lb", "422b94c0e663305869cb2d2f1109a0bc"), + Common::DE_DEU, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "lilmonster", + "", + AD_ENTRY1("lmasf.lb", "8c22e79c97a86827d56b4c596066dcea"), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "lilmonster", + "", + AD_ENTRY1("EnglishBO", "7aa2a1694255000b72ff0cc179f8059f"), + Common::EN_GRB, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "lilmonster", + "", + AD_ENTRY1("GermanBO", "ff7ac4b1b4f2ded71ff3650f383fea48"), + Common::DE_DEU, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "lilmonster", + "", + AD_ENTRY1("FrenchBO", "d13e5eae0f68cecc91a0dcfcceec7061"), + Common::FR_FRA, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + // From Scarlatti in bug #3275626 { { @@ -1686,6 +1974,38 @@ static const MohawkGameDescription gameDescriptions[] = { 0 }, + // From aluff in bug#3306722 + { + { + "stellaluna", + "", + AD_ENTRY1("STELLA.LB", "ca8562a79f63485680e21191f5865fd7"), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From aluff in bug#3306722 + { + { + "stellaluna", + "", + AD_ENTRY1("BookOutline", "7e931a455ac88557e04ca682579cd5a5"), + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + // Sheila Rae the Brave 1.0 // From pacifist { @@ -1703,6 +2023,118 @@ static const MohawkGameDescription gameDescriptions[] = { 0 }, + // From aluff in bug#3309934 + { + { + "sheila", + "", + AD_ENTRY1("BookOutline", "961f0cf4de2fbaa1da8ce0011822cd38"), + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "sheila", + "", + AD_ENTRY1("SRAEB.LB", "4835612022c2ae1944bde453d3202803"), + Common::EN_GRB, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "sheila", + "", + AD_ENTRY1("SRAED.LB", "3f21183534d324cf3bb8464f9217712c"), + Common::DE_DEU, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "sheila", + "", + AD_ENTRY1("SRAEF.LB", "96b00fc4b44c0e881c674d4bae5aa79a"), + Common::FR_FRA, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "sheila", + "", + AD_ENTRY1("EnglishBO", "6d3ad5724f1729a1d96d812668770c2e"), + Common::EN_GRB, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "sheila", + "", + AD_ENTRY1("GermanBO", "af1dc5a8bc8da58310d17b72b657fc1f"), + Common::DE_DEU, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + + // From afholman in bug#3309308 + { + { + "sheila", + "", + AD_ENTRY1("FrenchBO", "62eefcb8424a5f9ba7db5af6f0421e58"), + Common::FR_FRA, + Common::kPlatformMacintosh, + ADGF_NO_FLAGS, + Common::GUIO_NONE + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + { AD_TABLE_END_MARKER, 0, 0, 0 } }; diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index c3719bcd51..09f6fa5e2e 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -220,34 +220,11 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { } -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Parallaction::gameDescriptions, - // Size of that superset structure - sizeof(Parallaction::PARALLACTIONGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - parallactionGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - 0, - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOLAUNCHLOAD, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class ParallactionMetaEngine : public AdvancedMetaEngine { public: - ParallactionMetaEngine() : AdvancedMetaEngine(detectionParams) {} + ParallactionMetaEngine() : AdvancedMetaEngine(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) { + params.guioptions = Common::GUIO_NOLAUNCHLOAD; + } virtual const char *getName() const { return "Parallaction"; diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 23bdc73666..ece90855b7 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -101,34 +101,12 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { #include "saga/detection_tables.h" -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Saga::gameDescriptions, - // Size of that superset structure - sizeof(Saga::SAGAGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - sagaGames, - // Structure for autoupgrading obsolete targets - obsoleteGameIDsTable, - // Name of single gameid (optional) - "saga", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class SagaMetaEngine : public AdvancedMetaEngine { public: - SagaMetaEngine() : AdvancedMetaEngine(detectionParams) {} + SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { + params.obsoleteList = obsoleteGameIDsTable; + params.singleid = "saga"; + } virtual const char *getName() const { return "SAGA [" diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index af945247ba..b1b5f81995 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -131,6 +131,8 @@ 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("saved_bits", WRAP_METHOD(Console, cmdSavedBits)); + DCmd_Register("show_saved_bits", WRAP_METHOD(Console, cmdShowSavedBits)); // Segments DCmd_Register("segment_table", WRAP_METHOD(Console, cmdPrintSegmentTable)); DCmd_Register("segtable", WRAP_METHOD(Console, cmdPrintSegmentTable)); // alias @@ -364,6 +366,8 @@ bool Console::cmdHelp(int argc, const char **argv) { 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(" saved_bits - List saved bits on the hunk\n"); + DebugPrintf(" show_saved_bits - Display saved bits\n"); DebugPrintf("\n"); DebugPrintf("Segments:\n"); DebugPrintf(" segment_table / segtable - Lists all segments\n"); @@ -1600,6 +1604,174 @@ bool Console::cmdWindowList(int argc, const char **argv) { return true; } + +bool Console::cmdSavedBits(int argc, const char **argv) { + SegManager *segman = _engine->_gamestate->_segMan; + SegmentId id = segman->findSegmentByType(SEG_TYPE_HUNK); + HunkTable* hunks = (HunkTable*)segman->getSegmentObj(id); + if (!hunks) { + DebugPrintf("No hunk segment found.\n"); + return true; + } + + Common::Array<reg_t> entries = hunks->listAllDeallocatable(id); + + for (uint i = 0; i < entries.size(); ++i) { + uint16 offset = entries[i].offset; + const Hunk& h = hunks->_table[offset]; + if (strcmp(h.type, "SaveBits()") == 0) { + byte* memoryPtr = (byte*)h.mem; + + if (memoryPtr) { + DebugPrintf("%04x:%04x:", PRINT_REG(entries[i])); + + Common::Rect rect; + byte mask; + assert(h.size >= sizeof(rect) + sizeof(mask)); + + memcpy((void *)&rect, memoryPtr, sizeof(rect)); + memcpy((void *)&mask, memoryPtr + sizeof(rect), sizeof(mask)); + + DebugPrintf(" %d,%d - %d,%d", rect.top, rect.left, + rect.bottom, rect.right); + if (mask & GFX_SCREEN_MASK_VISUAL) + DebugPrintf(" visual"); + if (mask & GFX_SCREEN_MASK_PRIORITY) + DebugPrintf(" priority"); + if (mask & GFX_SCREEN_MASK_CONTROL) + DebugPrintf(" control"); + if (mask & GFX_SCREEN_MASK_DISPLAY) + DebugPrintf(" display"); + DebugPrintf("\n"); + } + } + } + + + return true; +} + +bool Console::cmdShowSavedBits(int argc, const char **argv) { + if (argc < 2) { + DebugPrintf("Display saved bits.\n"); + DebugPrintf("Usage: %s <address>\n", argv[0]); + DebugPrintf("Check the \"addresses\" command on how to use addresses\n"); + return true; + } + + reg_t memoryHandle = NULL_REG; + + if (parse_reg_t(_engine->_gamestate, argv[1], &memoryHandle, false)) { + DebugPrintf("Invalid address passed.\n"); + DebugPrintf("Check the \"addresses\" command on how to use addresses\n"); + return true; + } + + if (memoryHandle.isNull()) { + DebugPrintf("Invalid address.\n"); + return true; + } + + SegManager *segman = _engine->_gamestate->_segMan; + SegmentId id = segman->findSegmentByType(SEG_TYPE_HUNK); + HunkTable* hunks = (HunkTable*)segman->getSegmentObj(id); + if (!hunks) { + DebugPrintf("No hunk segment found.\n"); + return true; + } + + if (memoryHandle.segment != id || !hunks->isValidOffset(memoryHandle.offset)) { + DebugPrintf("Invalid address.\n"); + return true; + } + + const Hunk& h = hunks->_table[memoryHandle.offset]; + + if (strcmp(h.type, "SaveBits()") != 0) { + DebugPrintf("Invalid address.\n"); + return true; + } + + byte *memoryPtr = segman->getHunkPointer(memoryHandle); + + if (!memoryPtr) { + DebugPrintf("Invalid or freed bits.\n"); + return true; + } + + // Now we _finally_ know these are valid saved bits + + Common::Rect rect; + byte mask; + assert(h.size >= sizeof(rect) + sizeof(mask)); + + memcpy((void *)&rect, memoryPtr, sizeof(rect)); + memcpy((void *)&mask, memoryPtr + sizeof(rect), sizeof(mask)); + + Common::Point tl(rect.left, rect.top); + Common::Point tr(rect.right-1, rect.top); + Common::Point bl(rect.left, rect.bottom-1); + Common::Point br(rect.right-1, rect.bottom-1); + + DebugPrintf(" %d,%d - %d,%d", rect.top, rect.left, + rect.bottom, rect.right); + if (mask & GFX_SCREEN_MASK_VISUAL) + DebugPrintf(" visual"); + if (mask & GFX_SCREEN_MASK_PRIORITY) + DebugPrintf(" priority"); + if (mask & GFX_SCREEN_MASK_CONTROL) + DebugPrintf(" control"); + if (mask & GFX_SCREEN_MASK_DISPLAY) + DebugPrintf(" display"); + DebugPrintf("\n"); + + if (!_engine->_gfxPaint16 || !_engine->_gfxScreen) + return true; + + // We backup all planes, and then flash the saved bits + // FIXME: This probably won't work well with hi-res games + + byte bakMask = GFX_SCREEN_MASK_VISUAL | GFX_SCREEN_MASK_PRIORITY | GFX_SCREEN_MASK_CONTROL; + int bakSize = _engine->_gfxScreen->bitsGetDataSize(rect, bakMask); + reg_t bakScreen = segman->allocateHunkEntry("show_saved_bits backup", bakSize); + byte* bakMemory = segman->getHunkPointer(bakScreen); + assert(bakMemory); + _engine->_gfxScreen->bitsSave(rect, bakMask, bakMemory); + +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER + // If a graphical debugger overlay is used, hide it here, so that the + // results can be drawn. + g_system->hideOverlay(); +#endif + + const int paintCount = 3; + for (int i = 0; i < paintCount; ++i) { + _engine->_gfxScreen->bitsRestore(memoryPtr); + _engine->_gfxScreen->drawLine(tl, tr, 0, 255, 255); + _engine->_gfxScreen->drawLine(tr, br, 0, 255, 255); + _engine->_gfxScreen->drawLine(br, bl, 0, 255, 255); + _engine->_gfxScreen->drawLine(bl, tl, 0, 255, 255); + _engine->_gfxScreen->copyRectToScreen(rect); + g_system->updateScreen(); + g_sci->sleep(500); + _engine->_gfxScreen->bitsRestore(bakMemory); + _engine->_gfxScreen->copyRectToScreen(rect); + g_system->updateScreen(); + if (i < paintCount - 1) + g_sci->sleep(500); + } + + _engine->_gfxPaint16->bitsFree(bakScreen); + +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER + // Show the graphical debugger overlay + g_system->showOverlay(); +#endif + + return true; +} + + bool Console::cmdParseGrammar(int argc, const char **argv) { DebugPrintf("Parse grammar, in strict GNF:\n"); @@ -2782,7 +2954,7 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) { uint16 argc2 = opparams[1]; if (kFuncNum == kernelFuncNum) { - DebugPrintf("Called from script %d, object %s, method %s(%d) with %d parameters\n", + DebugPrintf("Called from script %d, object %s, method %s(%d) with %d bytes for arguments\n", itr->getNumber(), objName, _engine->getKernel()->getSelectorName(obj->getFuncSelector(i)).c_str(), i, argc2); } @@ -2799,7 +2971,7 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) { // Check for end of function/script if (offset >= script->getBufSize()) break; - if (opcode == op_ret)// && offset >= maxJmpOffset) + if (opcode == op_ret && offset >= maxJmpOffset) break; } // while (true) } // for (uint16 i = 0; i < obj->getMethodCount(); i++) diff --git a/engines/sci/console.h b/engines/sci/console.h index 1e2ebe4ba2..d943923ba1 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 cmdSavedBits(int argc, const char **argv); + bool cmdShowSavedBits(int argc, const char **argv); // Segments bool cmdPrintSegmentTable(int argc, const char **argv); bool cmdSegmentInfo(int argc, const char **argv); diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 100b71efa7..302ba13247 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -371,35 +371,11 @@ static ADGameDescription s_fallbackDesc = { static char s_fallbackGameIdBuf[256]; - -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Sci::SciGameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - s_sciGameTitles, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "sci", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class SciMetaEngine : public AdvancedMetaEngine { public: - SciMetaEngine() : AdvancedMetaEngine(detectionParams) {} + SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles) { + params.singleid = "sci"; + } virtual const char *getName() const { return "SCI [SCI0, SCI01, SCI10, SCI11" diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index d56d8f03cd..def3879945 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -503,6 +503,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + // Eco Quest 2 - Spanish DOS Floppy (supplied by umbrio in bug report #3313962) + {"ecoquest2", "Floppy", { + {"resource.map", 0, "a6b271b934afa7e84d03816a4fefa67b", 5593}, + {"resource.000", 0, "1c4093f7248240329121fdf8c0d59152", 4209150}, + {"resource.msg", 0, "eff8be1925d42288de55e405983e9314", 117810}, + AD_LISTEND}, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + // Freddy Pharkas - English DOS demo (from FRG) // SCI interpreter version 1.001.069 {"freddypharkas", "Demo", { diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index ee88d8af15..e1e52215d2 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -100,12 +100,12 @@ enum { -reg_t file_open(EngineState *s, const char *filename, int mode, bool unwrapFilename) { +reg_t file_open(EngineState *s, const Common::String &filename, int mode, bool unwrapFilename) { Common::String englishName = g_sci->getSciLanguageString(filename, K_LANG_ENGLISH); Common::String wrappedName = unwrapFilename ? g_sci->wrapFilename(englishName) : englishName; Common::SeekableReadStream *inFile = 0; Common::WriteStream *outFile = 0; - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); if (mode == _K_FILE_MODE_OPEN_OR_FAIL) { // Try to open file, abort if not possible @@ -178,7 +178,7 @@ reg_t kFOpen(EngineState *s, int argc, reg_t *argv) { int mode = argv[1].toUint16(); debugC(kDebugLevelFile, "kFOpen(%s,0x%x)", name.c_str(), mode); - return file_open(s, name.c_str(), mode, true); + return file_open(s, name, mode, true); } static FileHandle *getFileFromHandle(EngineState *s, uint handle) { @@ -349,7 +349,7 @@ reg_t kDeviceInfo(EngineState *s, int argc, reg_t *argv) { if (findSavegame(saves, savegameId) != -1) { // Confirmed that this id still lives... Common::String filename = g_sci->getSavegameName(savegameId); - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); saveFileMan->removeSavefile(filename); } break; @@ -410,7 +410,7 @@ static bool _savegame_sort_byDate(const SavegameDesc &l, const SavegameDesc &r) // Create a sorted array containing all found savedgames static void listSavegames(Common::Array<SavegameDesc> &saves) { - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); // Load all saves Common::StringArray saveNames = saveFileMan->listSavefiles(g_sci->getSavegamePattern()); @@ -637,14 +637,14 @@ reg_t kSaveGame(EngineState *s, int argc, reg_t *argv) { s->r_acc = NULL_REG; Common::String filename = g_sci->getSavegameName(savegameId); - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); Common::OutSaveFile *out; out = saveFileMan->openForSaving(filename); if (!out) { warning("Error opening savegame \"%s\" for writing", filename.c_str()); } else { - if (!gamestate_save(s, out, game_description.c_str(), version.c_str())) { + if (!gamestate_save(s, out, game_description, version)) { warning("Saving the game failed"); } else { s->r_acc = TRUE_REG; // save successful @@ -705,7 +705,7 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) { s->r_acc = TRUE_REG; warning("Savegame ID %d not found", savegameId); } else { - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); Common::String filename = g_sci->getSavegameName(savegameId); Common::SeekableReadStream *in; @@ -792,7 +792,7 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) { unwrapFilename = false; } - return file_open(s, name.c_str(), mode, unwrapFilename); + return file_open(s, name, mode, unwrapFilename); } reg_t kFileIOClose(EngineState *s, int argc, reg_t *argv) { @@ -845,7 +845,7 @@ reg_t kFileIOWriteRaw(EngineState *s, int argc, reg_t *argv) { reg_t kFileIOUnlink(EngineState *s, int argc, reg_t *argv) { Common::String name = s->_segMan->getString(argv[0]); - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); bool result; // SQ4 floppy prepends /\ to the filenames @@ -920,7 +920,7 @@ reg_t kFileIOSeek(EngineState *s, int argc, reg_t *argv) { } void DirSeeker::addAsVirtualFiles(Common::String title, Common::String fileMask) { - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); Common::StringArray foundFiles = saveFileMan->listSavefiles(fileMask); if (!foundFiles.empty()) { _files.push_back(title); @@ -984,7 +984,7 @@ reg_t DirSeeker::firstFile(const Common::String &mask, reg_t buffer, SegManager const Common::String wrappedMask = g_sci->wrapFilename(mask); // Obtain a list of all files matching the given mask - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); _files = saveFileMan->listSavefiles(wrappedMask); } @@ -1043,7 +1043,7 @@ reg_t kFileIOExists(EngineState *s, int argc, reg_t *argv) { exists = Common::File::exists(name); // Check for a savegame with the name - Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager(); + Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager(); if (!exists) exists = !saveFileMan->listSavefiles(name).empty(); @@ -1083,7 +1083,7 @@ reg_t kFileIORename(EngineState *s, int argc, reg_t *argv) { // SCI1.1 returns 0 on success and a DOS error code on fail. SCI32 // returns -1 on fail. We just return -1 for all versions. - if (g_engine->getSaveFileManager()->renameSavefile(oldName, newName)) + if (g_sci->getSaveFileManager()->renameSavefile(oldName, newName)) return NULL_REG; else return SIGNAL_REG; diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 16098ab275..957930784b 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -174,13 +174,15 @@ reg_t disassemble(EngineState *s, reg_t pos, bool printBWTag, bool printBytecode break; case Script_SRelative: - if (opsize) - param_value = scr[retval.offset++]; + if (opsize) { + int8 offset = (int8)scr[retval.offset++]; + debugN(" %02x [%04x]", 0xff & offset, 0xffff & (retval.offset + offset)); + } else { - param_value = READ_SCI11ENDIAN_UINT16(&scr[retval.offset]); + int16 offset = (int16)READ_SCI11ENDIAN_UINT16(&scr[retval.offset]); retval.offset += 2; + debugN(" %04x [%04x]", 0xffff & offset, 0xffff & (retval.offset + offset)); } - debugN(opsize ? " %02x [%04x]" : " %04x [%04x]", param_value, (0xffff) & (retval.offset + param_value)); break; case Script_End: diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index e094ed3bd7..3328f80de1 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -192,10 +192,10 @@ static kLanguage charToLanguage(const char c) { } } -Common::String SciEngine::getSciLanguageString(const char *str, kLanguage lang, kLanguage *lang2) const { +Common::String SciEngine::getSciLanguageString(const Common::String &str, kLanguage lang, kLanguage *lang2) const { kLanguage secondLang = K_LANG_NONE; - const char *seeker = str; + const char *seeker = str.c_str(); while (*seeker) { if ((*seeker == '%') || (*seeker == '#')) { secondLang = charToLanguage(*(seeker + 1)); @@ -242,9 +242,9 @@ Common::String SciEngine::getSciLanguageString(const char *str, kLanguage lang, } if (seeker) - return Common::String(str, seeker - str); + return Common::String(str.c_str(), seeker - str.c_str()); else - return Common::String(str); + return str; } kLanguage SciEngine::getSciLanguage() { diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 499574957e..1517355365 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -130,16 +130,16 @@ static reg_t read_var(EngineState *s, int type, int index) { if (solution.type == WORKAROUND_NONE) { #ifdef RELEASE_BUILD // If we are running an official ScummVM release -> fake 0 in unknown cases - warning("Uninitialized read for temp %d from method %s::%s (script %d, room %d, localCall %x)", - index, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, - g_sci->getEngineState()->currentRoomNumber(), originReply.localCallOffset); + warning("Uninitialized read for temp %d from method %s::%s (room %d, script %d, localCall %x)", + index, originReply.objectName.c_str(), originReply.methodName.c_str(), s->currentRoomNumber(), + originReply.scriptNr, originReply.localCallOffset); s->variables[type][index] = NULL_REG; break; #else - error("Uninitialized read for temp %d from method %s::%s (script %d, room %d, localCall %x)", - index, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, - g_sci->getEngineState()->currentRoomNumber(), originReply.localCallOffset); + error("Uninitialized read for temp %d from method %s::%s (room %d, script %d, localCall %x)", + index, originReply.objectName.c_str(), originReply.methodName.c_str(), s->currentRoomNumber(), + originReply.scriptNr, originReply.localCallOffset); #endif } assert(solution.type == WORKAROUND_FAKE); @@ -366,9 +366,9 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) { switch (solution.type) { case WORKAROUND_NONE: kernel->signatureDebug(kernelCall.signature, argc, argv); - error("[VM] k%s[%x]: signature mismatch via method %s::%s (script %d, room %d, localCall 0x%x)", + error("[VM] k%s[%x]: signature mismatch via method %s::%s (room %d, script %d, localCall 0x%x)", kernelCall.name, kernelCallNr, originReply.objectName.c_str(), originReply.methodName.c_str(), - originReply.scriptNr, s->currentRoomNumber(), originReply.localCallOffset); + s->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset); break; case WORKAROUND_IGNORE: // don't do kernel call, leave acc alone return; @@ -418,13 +418,13 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) { int callNameLen = strlen(kernelCall.name); if (strncmp(kernelCall.name, kernelSubCall.name, callNameLen) == 0) { const char *subCallName = kernelSubCall.name + callNameLen; - error("[VM] k%s(%s): signature mismatch via method %s::%s (script %d, room %d, localCall %x)", + error("[VM] k%s(%s): signature mismatch via method %s::%s (room %d, script %d, localCall %x)", kernelCall.name, subCallName, originReply.objectName.c_str(), originReply.methodName.c_str(), - originReply.scriptNr, s->currentRoomNumber(), originReply.localCallOffset); + s->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset); } - error("[VM] k%s: signature mismatch via method %s::%s (script %d, room %d, localCall %x)", + error("[VM] k%s: signature mismatch via method %s::%s (room %d, script %d, localCall %x)", kernelSubCall.name, originReply.objectName.c_str(), originReply.methodName.c_str(), - originReply.scriptNr, s->currentRoomNumber(), originReply.localCallOffset); + s->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset); break; } case WORKAROUND_IGNORE: // don't do kernel call, leave acc alone diff --git a/engines/sci/engine/vm_types.cpp b/engines/sci/engine/vm_types.cpp index 71a28a9761..e39c7708ad 100644 --- a/engines/sci/engine/vm_types.cpp +++ b/engines/sci/engine/vm_types.cpp @@ -32,9 +32,9 @@ reg_t reg_t::lookForWorkaround(const reg_t right) const { SciTrackOriginReply originReply; SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, arithmeticWorkarounds, &originReply); if (solution.type == WORKAROUND_NONE) - error("Invalid arithmetic operation (params: %04x:%04x and %04x:%04x) from method %s::%s (script %d, room %d, localCall %x)", + error("Invalid arithmetic operation (params: %04x:%04x and %04x:%04x) from method %s::%s (room %d, script %d, localCall %x)", PRINT_REG(*this), PRINT_REG(right), originReply.objectName.c_str(), - originReply.methodName.c_str(), originReply.scriptNr, g_sci->getEngineState()->currentRoomNumber(), + originReply.methodName.c_str(), g_sci->getEngineState()->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset); assert(solution.type == WORKAROUND_FAKE); return make_reg(0, solution.value); diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index fa25b02a8f..464b4d8d5b 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -34,6 +34,7 @@ namespace Sci { const SciWorkaroundEntry arithmeticWorkarounds[] = { { GID_CAMELOT, 92, 92, 0, "endingCartoon2", "changeState", 0x20d, 0, { WORKAROUND_FAKE, 0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #3044734 { GID_ECOQUEST2, 100, 0, 0, "Rain", "points", 0xcc6, 0, { WORKAROUND_FAKE, 0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #3034464 + { GID_ECOQUEST2, 100, 0, 0, "Rain", "points", 0xce0, 0, { WORKAROUND_FAKE, 0 } }, // Same as above, for the Spanish version - bug #3313962 { GID_FANMADE, 516, 983, 0, "Wander", "setTarget", -1, 0, { WORKAROUND_FAKE, 0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #3038913 { GID_ICEMAN, 199, 977, 0, "Grooper", "doit", -1, 0, { WORKAROUND_FAKE, 0 } }, // op_add: While dancing with the girl { GID_MOTHERGOOSE256, -1, 999, 0, "Event", "new", -1, 0, { WORKAROUND_FAKE, 0 } }, // op_and: constantly during the game (SCI1 version) @@ -447,7 +448,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun workaround = workaroundList; while (workaround->methodName) { bool objectNameMatches = (workaround->objectName == NULL) || - (workaround->objectName == g_sci->getSciLanguageString(searchObjectName.c_str(), K_LANG_ENGLISH)); + (workaround->objectName == g_sci->getSciLanguageString(searchObjectName, K_LANG_ENGLISH)); // Special case: in the fanmade Russian translation of SQ4, all // of the object names have been deleted or renamed to Russian, @@ -460,7 +461,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun && ((workaround->roomNr == -1) || (workaround->roomNr == curRoomNumber)) && ((workaround->inheritanceLevel == -1) || (workaround->inheritanceLevel == inheritanceLevel)) && objectNameMatches - && workaround->methodName == g_sci->getSciLanguageString(curMethodName.c_str(), K_LANG_ENGLISH) + && workaround->methodName == g_sci->getSciLanguageString(curMethodName, K_LANG_ENGLISH) && workaround->localCallOffset == lastCall->debugLocalCallOffset && ((workaround->index == -1) || (workaround->index == index))) { // Workaround found diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp index 1dbe279f8a..3183ffa2b9 100644 --- a/engines/sci/graphics/compare.cpp +++ b/engines/sci/graphics/compare.cpp @@ -84,7 +84,14 @@ reg_t GfxCompare::canBeHereCheckRectList(reg_t checkObject, const Common::Rect & curRect.right = readSelectorValue(_segMan, curObject, SELECTOR(brRight)); curRect.bottom = readSelectorValue(_segMan, curObject, SELECTOR(brBottom)); // Check if curRect is within checkRect - if (checkRect.contains(curRect)) + // This behavior is slightly odd, but it's how the original SCI + // engine did it: a rect cannot be contained within itself + // (there is no equality). Do NOT change this to contains(), as + // it breaks KQ4 early (bug #3315639). + if (curRect.right > checkRect.left && + curRect.left < checkRect.right && + curRect.bottom > checkRect.top && + curRect.top < checkRect.bottom) return curObject; } } diff --git a/engines/sci/graphics/controls.cpp b/engines/sci/graphics/controls.cpp index 0289735c0a..8d4712a969 100644 --- a/engines/sci/graphics/controls.cpp +++ b/engines/sci/graphics/controls.cpp @@ -329,7 +329,6 @@ void GfxControls::kernelDrawText(Common::Rect rect, reg_t obj, const char *text, if (style & SCI_CONTROLS_STYLE_SELECTED) { _paint16->frameRect(rect); } - rect.grow(1); if (!getPicNotValid()) _paint16->bitsShow(rect); } else { diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp index 9d4ab3f589..913f680e99 100644 --- a/engines/sci/graphics/menu.cpp +++ b/engines/sci/graphics/menu.cpp @@ -423,7 +423,9 @@ reg_t GfxMenu::kernelSelect(reg_t eventObject, bool pauseSound) { default: while (itemIterator != itemEnd) { itemEntry = *itemIterator; - if ((itemEntry->keyPress == keyPress) && (itemEntry->keyModifier == keyModifier)) + if (itemEntry->keyPress == keyPress && + itemEntry->keyModifier == keyModifier && + itemEntry->enabled) break; itemIterator++; } diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index 6529a6ae64..ce69ba8922 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -330,7 +330,7 @@ void GfxPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rlePos if (!_addToFlag && _resourceType != SCI_PICTURE_TYPE_SCI32) clearColor = _screen->getColorWhite(); - byte drawMask = priority == 255 ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL | GFX_SCREEN_MASK_PRIORITY; + byte drawMask = priority > 15 ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL | GFX_SCREEN_MASK_PRIORITY; ptr = celBitmap; ptr += skipCelBitmapPixels; diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index 2446ea545e..4ab0b9719f 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -763,11 +763,14 @@ int16 GfxScreen::kernelPicNotValid(int16 newPicNotValid) { uint16 GfxScreen::getLowResScreenHeight() { // Some Mac SCI1/1.1 games only take up 190 rows and do not // have the menu bar. + // TODO: Verify that LSL1 and LSL5 use height 190 if (g_sci->getPlatform() == Common::kPlatformMacintosh) { switch (g_sci->getGameId()) { case GID_FREDDYPHARKAS: case GID_KQ5: case GID_KQ6: + case GID_LSL1: + case GID_LSL5: case GID_SQ1: return 190; default: diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp index 1256db8969..d047eb10a1 100644 --- a/engines/sci/graphics/transitions.cpp +++ b/engines/sci/graphics/transitions.cpp @@ -189,14 +189,6 @@ void GfxTransitions::doit(Common::Rect picRect) { // Now we do the actual transition to the new screen doTransition(_number, false); - if (picRect.bottom != _screen->getHeight()) { - // TODO: this is a workaround for lsl6 not showing menubar when playing - // There is some new code in the sierra sci in ShowPic that seems to do - // something similar to this - _screen->copyToScreen(); - g_system->updateScreen(); - } - _screen->_picNotValid = 0; } diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp index 5c8e9c3d2e..afb4c184e8 100644 --- a/engines/sci/graphics/view.cpp +++ b/engines/sci/graphics/view.cpp @@ -692,7 +692,7 @@ void GfxView::draw(const Common::Rect &rect, const Common::Rect &clipRect, const const int16 celHeight = celInfo->height; const int16 celWidth = celInfo->width; const byte clearKey = celInfo->clearKey; - const byte drawMask = (priority == 255) ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY; + const byte drawMask = priority > 15 ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY; int x, y; if (_embeddedPal) @@ -753,7 +753,7 @@ void GfxView::drawScaled(const Common::Rect &rect, const Common::Rect &clipRect, const int16 celHeight = celInfo->height; const int16 celWidth = celInfo->width; const byte clearKey = celInfo->clearKey; - const byte drawMask = (priority == 255) ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY; + const byte drawMask = priority > 15 ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY; uint16 scalingX[640]; uint16 scalingY[480]; int16 scaledWidth, scaledHeight; diff --git a/engines/sci/sci.h b/engines/sci/sci.h index 77718e4b37..04ccbd97d2 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -290,7 +290,7 @@ public: void setSciLanguage(kLanguage lang); void setSciLanguage(); - Common::String getSciLanguageString(const char *str, kLanguage lang, kLanguage *lang2 = NULL) const; + Common::String getSciLanguageString(const Common::String &str, kLanguage lang, kLanguage *lang2 = NULL) const; // Check if vocabulary needs to get switched (in multilingual parser games) void checkVocabularySwitch(); diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp index 158b4b08fb..1436ca45a7 100644 --- a/engines/sci/sound/drivers/amigamac.cpp +++ b/engines/sci/sound/drivers/amigamac.cpp @@ -24,6 +24,7 @@ #include "sci/sound/drivers/mididriver.h" #include "sci/resource.h" +#include "common/debug-channels.h" #include "common/file.h" #include "common/frac.h" #include "common/memstream.h" @@ -33,8 +34,6 @@ namespace Sci { -//#define DEBUG - class MidiDriver_AmigaMac : public MidiDriver_Emulated { public: enum { @@ -287,12 +286,10 @@ void MidiDriver_AmigaMac::playInstrument(int16 *dest, Voice *channel, int count) } void MidiDriver_AmigaMac::changeInstrument(int channel, int instrument) { -#ifdef DEBUG - if (_bank.instruments[instrument][0]) - debugN("Amiga/Mac driver: Setting channel %i to \"%s\" (%i)\n", channel, _bank.instruments[instrument].name, instrument); + if (((uint)instrument < _bank.instruments.size()) && (_bank.instruments[instrument].size() > 0)) + debugC(1, kDebugLevelSound, "Amiga/Mac driver: Setting channel %i to \"%s\" (%i)", channel, _bank.instruments[instrument].name, instrument); else - warning("Amiga/Mac driver: instrument %i does not exist (channel %i)", instrument, channel); -#endif + debugC(kDebugLevelSound, "Amiga/Mac driver: instrument %i does not exist (channel %i)", instrument, channel); _channels[channel].instrument = instrument; } @@ -325,9 +322,7 @@ void MidiDriver_AmigaMac::stopNote(int ch, int note) { break; if (channel == kChannels) { -#ifdef DEBUG - warning("Amiga/Mac driver: cannot stop note %i on channel %i", note, ch); -#endif + debugC(1, kDebugLevelSound, "Amiga/Mac driver: cannot stop note %i on channel %i", note, ch); return; } @@ -466,9 +461,9 @@ MidiDriver_AmigaMac::InstrumentSample *MidiDriver_AmigaMac::readInstrumentSCI0(C instrument->fixedNote = 101; instrument->mode = header[33]; - instrument->transpose = (int8) header[34]; + instrument->transpose = (int8)header[34]; for (int i = 0; i < 4; i++) { - int length = (int8) header[49 + i]; + int length = (int8)header[49 + i]; if (length == 0 && i > 0) length = 256; @@ -488,15 +483,18 @@ MidiDriver_AmigaMac::InstrumentSample *MidiDriver_AmigaMac::readInstrumentSCI0(C strncpy(instrument->name, (char *) header + 2, 29); instrument->name[29] = 0; -#ifdef DEBUG - debugN("Amiga/Mac driver: Reading instrument %i: \"%s\" (%i bytes)\n", - *id, instrument->name, size); - debugN(" Mode: %02x\n", instrument->mode); - debugN(" Looping: %s\n", instrument->mode & kModeLoop ? "on" : "off"); - debugN(" Pitch changes: %s\n", instrument->mode & kModePitch ? "on" : "off"); - debugN(" Segment sizes: %i %i %i\n", seg_size[0], seg_size[1], seg_size[2]); - debugN(" Segment offsets: 0 %i %i\n", loop_offset, (int32)READ_BE_UINT32(header + 43)); -#endif + if (DebugMan.isDebugChannelEnabled(kDebugLevelSound)) { + debug("Amiga/Mac driver: Reading instrument %i: \"%s\" (%i bytes)", + *id, instrument->name, size); + debugN(" Mode: %02x (", header[33]); + debugN("looping: %s, ", header[33] & kModeLoop ? "on" : "off"); + debug("pitch changes: %s)", header[33] & kModePitch ? "on" : "off"); + debug(" Transpose: %i", (int8)header[34]); + for (uint i = 0; i < 3; i++) + debug(" Segment %i: %i words @ offset %i", i, (int16)READ_BE_UINT16(header + 35 + 6 * i), (i == 0 ? 0 : (int32)READ_BE_UINT32(header + 31 + 6 * i))); + for (uint i = 0; i < 4; i++) + debug(" Envelope %i: period %i / delta %i / target %i", i, header[49 + i], (int8)header[53 + i], header[57 + i]); + } instrument->samples = (int8 *) malloc(size + 1); if (file.read(instrument->samples, size) < (unsigned int)size) { @@ -511,10 +509,8 @@ MidiDriver_AmigaMac::InstrumentSample *MidiDriver_AmigaMac::readInstrumentSCI0(C if (instrument->mode & kModeLoop) { if (loop_offset + seg_size[1] > size) { -#ifdef DEBUG - warning("Amiga/Mac driver: looping samples extend %i bytes past end of sample block", - loop_offset + seg_size[1] - size); -#endif + debugC(kDebugLevelSound, "Amiga/Mac driver: looping samples extend %i bytes past end of sample block", + loop_offset + seg_size[1] - size); seg_size[1] = size - loop_offset; } @@ -675,15 +671,11 @@ void MidiDriver_AmigaMac::send(uint32 b) { break; case 0x0a: // pan // TODO -#ifdef DEBUG - warning("Amiga/Mac driver: ignoring pan 0x%02x event for channel %i", op2, channel); -#endif + debugC(1, kDebugLevelSound, "Amiga/Mac driver: ignoring pan 0x%02x event for channel %i", op2, channel); break; case 0x40: // hold // TODO -#ifdef DEBUG - warning("Amiga/Mac driver: ignoring hold 0x%02x event for channel %i", op2, channel); -#endif + debugC(1, kDebugLevelSound, "Amiga/Mac driver: ignoring hold 0x%02x event for channel %i", op2, channel); break; case 0x4b: // voice mapping break; @@ -768,9 +760,7 @@ bool MidiDriver_AmigaMac::loadInstrumentsSCI0(Common::File &file) { _bank.size = READ_BE_UINT16(header + 38); strncpy(_bank.name, (char *) header + 8, 29); _bank.name[29] = 0; -#ifdef DEBUG - debugN("Amiga/Mac driver: Reading %i instruments from bank \"%s\"\n", _bank.size, _bank.name); -#endif + debugC(kDebugLevelSound, "Amiga/Mac driver: Reading %i instruments from bank \"%s\"", _bank.size, _bank.name); for (uint i = 0; i < _bank.size; i++) { int id; @@ -807,9 +797,7 @@ bool MidiDriver_AmigaMac::loadInstrumentsSCI0Mac(Common::SeekableReadStream &fil _bank.size = 128; strncpy(_bank.name, (char *) header + 8, 29); _bank.name[29] = 0; -#ifdef DEBUG - debugN("Amiga/Mac driver: Reading %i instruments from bank \"%s\"\n", _bank.size, _bank.name); -#endif + debugC(kDebugLevelSound, "Amiga/Mac driver: Reading %i instruments from bank \"%s\"", _bank.size, _bank.name); Common::Array<uint32> instrumentOffsets; instrumentOffsets.resize(_bank.size); diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp index 82bb32cdfb..10d6ee0082 100644 --- a/engines/scumm/gfx_towns.cpp +++ b/engines/scumm/gfx_towns.cpp @@ -248,7 +248,7 @@ void TownsScreen::setupLayer(int layer, int width, int height, int numCol, void l->palette = (uint8*)pal; if (l->palette && _bpp == 1) - warning("TownsScreen::setupLayer(): Layer palette usage requires 15 bit graphics setting.\nLayer palette will be ignored."); + warning("TownsScreen::setupLayer(): Layer palette usage requires 16 bit graphics setting.\nLayer palette will be ignored."); delete[] l->pixels; l->pixels = new uint8[l->pitch * l->height]; @@ -270,7 +270,8 @@ void TownsScreen::setupLayer(int layer, int width, int height, int numCol, void l->bltTmpPal = (l->bpp == 1 && _bpp == 2) ? new uint16[l->numCol] : 0; l->enabled = true; - l->onBottom = (!layer || !_layers[0].enabled); + _layers[0].onBottom = true; + _layers[1].onBottom = _layers[0].enabled ? false : true; l->ready = true; } @@ -420,10 +421,10 @@ void TownsScreen::toggleLayers(int flag) { if (flag < 0 || flag > 3) return; - for (int i = 0; i < 2; ++i) { - _layers[i].enabled = (flag & (i + 1)) ? true : false; - _layers[i].onBottom = (!i || !_layers[0].enabled); - } + _layers[0].enabled = (flag & 1) ? true : false; + _layers[0].onBottom = true; + _layers[1].enabled = (flag & 2) ? true : false; + _layers[1].onBottom = _layers[0].enabled ? false : true; _dirtyRects.clear(); _dirtyRects.push_back(Common::Rect(_width - 1, _height - 1)); @@ -458,12 +459,12 @@ void TownsScreen::updateOutputBuffer() { for (int y = r->top; y <= r->bottom; ++y) { if (l->bpp == _bpp && l->scaleW == 1 && l->onBottom) { - memcpy(dst, l->bltInternY[y] + l->bltInternX[r->left], (r->right + 1 - r->left) * _bpp); + memcpy(dst, &l->bltInternY[y][l->bltInternX[r->left]], (r->right + 1 - r->left) * _bpp); dst += _pitch; } else if (_bpp == 2) { for (int x = r->left; x <= r->right; ++x) { - uint8 *src = l->bltInternY[y] + l->bltInternX[x]; + uint8 *src = &l->bltInternY[y][l->bltInternX[x]]; if (l->bpp == 1) { uint8 col = *src; if (col || l->onBottom) { @@ -480,7 +481,7 @@ void TownsScreen::updateOutputBuffer() { } else { for (int x = r->left; x <= r->right; ++x) { - uint8 col = *(l->bltInternY[y] + l->bltInternX[x]); + uint8 col = l->bltInternY[y][l->bltInternX[x]]; if (col || l->onBottom) { if (l->numCol == 16) col = (col >> 4) & (col & 0x0f); diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 6b195bec84..4565bb9f26 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -171,7 +171,7 @@ bool MacResExtractor::extractResource(int id, CachedCursor *cc) { return false; // If we don't have a cursor palette, force monochrome cursors - bool forceMonochrome = !_vm->_system->hasFeature(OSystem::kFeatureCursorHasPalette); + bool forceMonochrome = !_vm->_system->hasFeature(OSystem::kFeatureCursorPalette); Graphics::MacCursor *macCursor = new Graphics::MacCursor(); diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index c0c477a597..dd26e23b4d 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -162,7 +162,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _pauseDialog = NULL; _versionDialog = NULL; _fastMode = 0; - _actors = NULL; + _actors = _sortedActors = NULL; _arraySlot = NULL; _inventory = NULL; _newNames = NULL; @@ -584,9 +584,12 @@ ScummEngine::~ScummEngine() { _mixer->stopAll(); - for (int i = 0; i < _numActors; ++i) - delete _actors[i]; - delete[] _actors; + if (_actors) { + for (int i = 0; i < _numActors; ++i) + delete _actors[i]; + delete[] _actors; + } + delete[] _sortedActors; delete[] _2byteFontPtr; @@ -1361,6 +1364,7 @@ void ScummEngine::resetScumm() { #ifdef USE_RGB_COLOR if (_game.features & GF_16BIT_COLOR #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + || _game.platform == Common::kPlatformFMTowns #endif ) @@ -1832,7 +1836,7 @@ void ScummEngine::setupMusic(int midi) { if (nativeMidiDriver != NULL && _native_mt32) nativeMidiDriver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); bool multi_midi = ConfMan.getBool("multi_midi") && _musicType != MDT_NONE && (midi & MDT_ADLIB); - if (_musicType == MDT_ADLIB || MDT_TOWNS || multi_midi) { + if (_musicType == MDT_ADLIB || _musicType == MDT_TOWNS || multi_midi) { adlibMidiDriver = MidiDriver::createMidi(MidiDriver::detectDevice(_musicType == MDT_TOWNS ? MDT_TOWNS : MDT_ADLIB)); adlibMidiDriver->property(MidiDriver::PROP_OLD_ADLIB, (_game.features & GF_SMALL_HEADER) ? 1 : 0); } diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index edb8c30545..c704b3e833 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -31,7 +31,7 @@ namespace Sword25 { uint32 Sword25Engine::getGameFlags() const { return _gameDescription->flags; } } -static const PlainGameDescriptor Sword25Game[] = { +static const PlainGameDescriptor sword25Game[] = { {"sword25", "Broken Sword 2.5"}, {0, 0} }; @@ -41,35 +41,13 @@ static const char *directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Sword25::gameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - Sword25Game, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - NULL, - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NOMIDI, - // Maximum directory depth - 2, - // List of directory globs - directoryGlobs -}; - class Sword25MetaEngine : public AdvancedMetaEngine { public: - Sword25MetaEngine() : AdvancedMetaEngine(detectionParams) {} - + Sword25MetaEngine() : AdvancedMetaEngine(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) { + params.guioptions = Common::GUIO_NOMIDI; + params.depth = 2; + params.directoryGlobs = directoryGlobs; + } virtual const char *getName() const { return "Sword25"; } diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index be6d940d23..098bd2c6b9 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -479,12 +479,6 @@ void TheoraDecoder::reset() { if (_fileStream) _fileStream->seek(0); -#if ENABLE_THEORA_SEEKING - _videobufGranulePos = -1; - _audiobufGranulePos = 0; - _videobufTime = 0; -#endif - _audiobufFill = 0; _audiobufReady = false; diff --git a/engines/sword25/gfx/animationresource.cpp b/engines/sword25/gfx/animationresource.cpp index a9c9cf9c29..b9d70cf87b 100644 --- a/engines/sword25/gfx/animationresource.cpp +++ b/engines/sword25/gfx/animationresource.cpp @@ -38,11 +38,11 @@ namespace Sword25 { -namespace { -const int DEFAULT_FPS = 10; -const int MIN_FPS = 1; -const int MAX_FPS = 200; -} +enum { + DEFAULT_FPS = 10, + MIN_FPS = 1, + MAX_FPS = 200 +}; AnimationResource::AnimationResource(const Common::String &filename) : Resource(filename, Resource::TYPE_ANIMATION), @@ -112,8 +112,8 @@ bool AnimationResource::parseBooleanKey(Common::String s, bool &result) { bool AnimationResource::parserCallback_animation(ParserNode *node) { if (!parseIntegerKey(node->values["fps"], 1, &_FPS) || (_FPS < MIN_FPS) || (_FPS > MAX_FPS)) { - return parserError("Illegal or missing fps attribute in <animation> tag in \"%s\". Assuming default (\"%d\").", - getFileName().c_str(), DEFAULT_FPS); + return parserError(Common::String::format("Illegal or missing fps attribute in <animation> tag in \"%s\". Assuming default (\"%d\").", + getFileName().c_str(), DEFAULT_FPS)); } // Loop type value diff --git a/engines/sword25/gfx/animationresource.h b/engines/sword25/gfx/animationresource.h index 2a1e3ce882..70291f220e 100644 --- a/engines/sword25/gfx/animationresource.h +++ b/engines/sword25/gfx/animationresource.h @@ -48,36 +48,35 @@ public: AnimationResource(const Common::String &filename); virtual ~AnimationResource(); - virtual const Frame &getFrame(uint index) const { - assert(index < _frames.size()); + virtual const Frame &getFrame(uint index) const { return _frames[index]; } - virtual uint getFrameCount() const { + virtual uint getFrameCount() const { return _frames.size(); } - virtual void unlock() { + virtual void unlock() { release(); } - Animation::ANIMATION_TYPES getAnimationType() const { + Animation::ANIMATION_TYPES getAnimationType() const { return _animationType; } - int getFPS() const { + int getFPS() const { return _FPS; } - int getMillisPerFrame() const { + int getMillisPerFrame() const { return _millisPerFrame; } - bool isScalingAllowed() const { + bool isScalingAllowed() const { return _scalingAllowed; } - bool isAlphaAllowed() const { + bool isAlphaAllowed() const { return _alphaAllowed; } - bool isColorModulationAllowed() const { + bool isColorModulationAllowed() const { return _colorModulationAllowed; } - bool isValid() const { + bool isValid() const { return _valid; } diff --git a/engines/sword25/gfx/fontresource.cpp b/engines/sword25/gfx/fontresource.cpp index f99987fc91..7657abb5f2 100644 --- a/engines/sword25/gfx/fontresource.cpp +++ b/engines/sword25/gfx/fontresource.cpp @@ -115,23 +115,23 @@ bool FontResource::parserCallback_character(ParserNode *node) { int charCode, top, left, right, bottom; if (!parseIntegerKey(node->values["code"], 1, &charCode) || (charCode < 0) || (charCode >= 256)) { - return parserError("Illegal or missing code attribute in <character> tag in \"%s\".", getFileName().c_str()); + return parserError("Illegal or missing code attribute in <character> tag in '" + getFileName() + "'."); } if (!parseIntegerKey(node->values["top"], 1, &top) || (top < 0)) { - return parserError("Illegal or missing top attribute in <character> tag in \"%s\".", getFileName().c_str()); + return parserError("Illegal or missing top attribute in <character> tag in '" + getFileName() + "'."); } if (!parseIntegerKey(node->values["left"], 1, &left) || (left < 0)) { - return parserError("Illegal or missing left attribute in <character> tag in \"%s\".", getFileName().c_str()); + return parserError("Illegal or missing left attribute in <character> tag in '" + getFileName() + "'."); } if (!parseIntegerKey(node->values["right"], 1, &right) || (right < 0)) { - return parserError("Illegal or missing right attribute in <character> tag in \"%s\".", getFileName().c_str()); + return parserError("Illegal or missing right attribute in <character> tag in '" + getFileName() + "'."); } if (!parseIntegerKey(node->values["bottom"], 1, &bottom) || (bottom < 0)) { - return parserError("Illegal or missing bottom attribute in <character> tag in \"%s\".", getFileName().c_str()); + return parserError("Illegal or missing bottom attribute in <character> tag in '" + getFileName() + "'."); } - this->_characterRects[charCode] = Common::Rect(left, top, right, bottom); + _characterRects[charCode] = Common::Rect(left, top, right, bottom); return true; } diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp index 20622b2098..9244137c25 100644 --- a/engines/sword25/sfx/soundengine.cpp +++ b/engines/sword25/sfx/soundengine.cpp @@ -37,6 +37,7 @@ #include "audio/decoders/vorbis.h" #include "common/system.h" +#include "common/config-manager.h" namespace Sword25 { @@ -65,8 +66,6 @@ SoundEngine::SoundEngine(Kernel *pKernel) : ResourceService(pKernel) { } bool SoundEngine::init(uint sampleRate, uint channels) { - warning("STUB: SoundEngine::init(%d, %d)", sampleRate, channels); - return true; } @@ -74,12 +73,44 @@ void SoundEngine::update() { } void SoundEngine::setVolume(float volume, SOUND_TYPES type) { - warning("STUB: SoundEngine::setVolume(%f, %d)", volume, type); + int val = (int)(255 * volume); + + switch (type) { + case SoundEngine::MUSIC: + ConfMan.setInt("music_volume", val); + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, val); + break; + case SoundEngine::SPEECH: + ConfMan.setInt("speech_volume", val); + _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, val); + break; + case SoundEngine::SFX: + ConfMan.setInt("sfx_volume", val); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, val); + break; + default: + error("Unknown SOUND_TYPE"); + } } float SoundEngine::getVolume(SOUND_TYPES type) { - warning("STUB: SoundEngine::getVolume(%d)", type); - return 0; + int val = 0; + + switch (type) { + case SoundEngine::MUSIC: + val = ConfMan.getInt("music_volume"); + break; + case SoundEngine::SPEECH: + val = ConfMan.getInt("speech_volume"); + break; + case SoundEngine::SFX: + val = ConfMan.getInt("sfx_volume"); + break; + default: + error("Unknown SOUND_TYPE"); + } + + return (float)val / 255.0; } void SoundEngine::pauseAll() { @@ -95,11 +126,15 @@ void SoundEngine::resumeAll() { } void SoundEngine::pauseLayer(uint layer) { - warning("STUB: SoundEngine::pauseLayer(%d)", layer); + // Not used in the game + + warning("SoundEngine::pauseLayer(%d)", layer); } void SoundEngine::resumeLayer(uint layer) { - warning("STUB: SoundEngine::resumeLayer(%d)", layer); + // Not used in the game + + warning("SoundEngine::resumeLayer(%d)", layer); } SndHandle *SoundEngine::getHandle(uint *id) { @@ -207,7 +242,9 @@ void SoundEngine::stopSound(uint handle) { } bool SoundEngine::isSoundPaused(uint handle) { - warning("STUB: SoundEngine::isSoundPaused(%d)", handle); + // Not used in the game + + warning("SoundEngine::isSoundPaused(%d)", handle); return false; } @@ -221,20 +258,18 @@ bool SoundEngine::isSoundPlaying(uint handle) { } float SoundEngine::getSoundVolume(uint handle) { - warning("STUB: SoundEngine::getSoundVolume(%d)", handle); + debugC(1, kDebugSound, "SoundEngine::getSoundVolume(%d)", handle); - return 0; + return (float)_mixer->getChannelVolume(_handles[handle].handle) / 255.0; } float SoundEngine::getSoundPanning(uint handle) { - warning("STUB: SoundEngine::getSoundPanning(%d)", handle); + debugC(1, kDebugSound, "SoundEngine::getSoundPanning(%d)", handle); - return 0; + return (float)_mixer->getChannelBalance(_handles[handle].handle) / 127.0; } Resource *SoundEngine::loadResource(const Common::String &fileName) { - warning("STUB: SoundEngine::loadResource(%s)", fileName.c_str()); - return new SoundResource(fileName); } diff --git a/engines/sword25/util/lua/ldblib.cpp b/engines/sword25/util/lua/ldblib.cpp index b2e249e9b7..4d0333b46e 100644 --- a/engines/sword25/util/lua/ldblib.cpp +++ b/engines/sword25/util/lua/ldblib.cpp @@ -4,6 +4,10 @@ ** See Copyright Notice in lua.h */ +#define FORBIDDEN_SYMBOL_EXCEPTION_stdin +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr +#define FORBIDDEN_SYMBOL_EXCEPTION_fputs +#define FORBIDDEN_SYMBOL_EXCEPTION_fgets #include <stdio.h> #include <stdlib.h> diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index 5012e6af65..b684560bc7 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -79,37 +79,14 @@ static const ADGameDescription teenAgentGameDescriptions[] = { AD_TABLE_END_MARKER, }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)teenAgentGameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - teenAgentGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "teenagent", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 +enum { + MAX_SAVES = 20 }; -#define MAX_SAVES 20 - - class TeenAgentMetaEngine : public AdvancedMetaEngine { public: - TeenAgentMetaEngine() : AdvancedMetaEngine(detectionParams) { + TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { + params.singleid = "teenagent"; } virtual const char *getName() const { diff --git a/engines/testbed/config.cpp b/engines/testbed/config.cpp index 6adf82952f..6bd4c82b41 100644 --- a/engines/testbed/config.cpp +++ b/engines/testbed/config.cpp @@ -126,10 +126,13 @@ void TestbedOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, ws = _testbedConfMan->getConfigWriteStream(); _testbedConfMan->writeTestbedConfigToStream(ws); delete ws; - default: - GUI::Dialog::handleCommand(sender, cmd, data); + break; + default: + break; } + + GUI::Dialog::handleCommand(sender, cmd, data); } void TestbedInteractionDialog::addText(uint w, uint h, const Common::String text, Graphics::TextAlign textAlign, uint xOffset, uint yPadding) { @@ -150,7 +153,7 @@ void TestbedInteractionDialog::addButton(uint w, uint h, const Common::String na _yOffset += h; } -void TestbedInteractionDialog::addList(uint x, uint y, uint w, uint h, Common::Array<Common::String> &strArray, GUI::ListWidget::ColorList *colors, uint yPadding) { +void TestbedInteractionDialog::addList(uint x, uint y, uint w, uint h, const Common::Array<Common::String> &strArray, GUI::ListWidget::ColorList *colors, uint yPadding) { _yOffset += yPadding; GUI::ListWidget *list = new GUI::ListWidget(this, x, y, w, h); list->setEditable(false); @@ -159,7 +162,7 @@ void TestbedInteractionDialog::addList(uint x, uint y, uint w, uint h, Common::A _yOffset += h; } -void TestbedInteractionDialog::addButtonXY(uint x, uint y, uint w, uint h, const Common::String name, uint32 cmd) { +void TestbedInteractionDialog::addButtonXY(uint x, uint /* y */, uint w, uint h, const Common::String name, uint32 cmd) { _buttonArray.push_back(new GUI::ButtonWidget(this, x, _yOffset, w, h, name, 0, cmd)); } @@ -174,7 +177,6 @@ void TestbedConfigManager::initDefaultConfiguration() { } void TestbedConfigManager::writeTestbedConfigToStream(Common::WriteStream *ws) { - Common::String wStr; for (Common::Array<Testsuite *>::const_iterator i = _testsuiteList.begin(); i < _testsuiteList.end(); i++) { _configFileInterface.setKey("this", (*i)->getName(), boolToString((*i)->isEnabled())); const Common::Array<Test *> &testList = (*i)->getTestList(); @@ -186,13 +188,13 @@ void TestbedConfigManager::writeTestbedConfigToStream(Common::WriteStream *ws) { ws->flush(); } -Common::SeekableReadStream *TestbedConfigManager::getConfigReadStream() { +Common::SeekableReadStream *TestbedConfigManager::getConfigReadStream() const { // Look for config file using SearchMan Common::SeekableReadStream *rs = SearchMan.createReadStreamForMember(_configFileName); return rs; } -Common::WriteStream *TestbedConfigManager::getConfigWriteStream() { +Common::WriteStream *TestbedConfigManager::getConfigWriteStream() const { // Look for config file in game-path const Common::String &path = ConfMan.get("path"); Common::WriteStream *ws; diff --git a/engines/testbed/config.h b/engines/testbed/config.h index c0df65ad32..fd5588aa31 100644 --- a/engines/testbed/config.h +++ b/engines/testbed/config.h @@ -50,8 +50,8 @@ public: ~TestbedConfigManager() {} void selectTestsuites(); void setConfigFile(const Common::String fName) { _configFileName = fName; } - Common::SeekableReadStream *getConfigReadStream(); - Common::WriteStream *getConfigWriteStream(); + Common::SeekableReadStream *getConfigReadStream() const; + Common::WriteStream *getConfigWriteStream() const; void writeTestbedConfigToStream(Common::WriteStream *ws); Testsuite *getTestsuiteByName(const Common::String &name); bool stringToBool(const Common::String str) { return str.equalsIgnoreCase("true") ? true : false; } @@ -119,7 +119,7 @@ public: void addButton(uint w, uint h, const Common::String name, uint32 cmd, uint xOffset = 0, uint yPadding = 8); void addButtonXY(uint x, uint y, uint w, uint h, const Common::String name, uint32 cmd); void addText(uint w, uint h, const Common::String text, Graphics::TextAlign textAlign, uint xOffset, uint yPadding = 8); - void addList(uint x, uint y, uint w, uint h, Common::Array<Common::String> &strArray, GUI::ListWidget::ColorList *colors = 0, uint yPadding = 8); + void addList(uint x, uint y, uint w, uint h, const Common::Array<Common::String> &strArray, GUI::ListWidget::ColorList *colors = 0, uint yPadding = 8); protected: Common::Array<GUI::ButtonWidget *> _buttonArray; uint _xOffset; diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 91518b2b8e..2c3d5b43c5 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -45,34 +45,11 @@ static const ADGameDescription testbedDescriptions[] = { AD_TABLE_END_MARKER }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)testbedDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 512, - // List of all engine targets - testbed_setting, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "testbed", - // List of files for file-based fallback detection (optional) - 0, - // Flags - ADGF_NO_FLAGS, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class TestbedMetaEngine : public AdvancedMetaEngine { public: - TestbedMetaEngine() : AdvancedMetaEngine(detectionParams) { + TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { + params.md5Bytes = 512; + params.singleid = "testbed"; } virtual const char *getName() const { @@ -83,7 +60,7 @@ public: return "Copyright (C) ScummVM"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription * /* desc */) const { // Instantiate Engine even if the game data is not found. *engine = new Testbed::TestbedEngine(syst); return true; diff --git a/engines/testbed/fs.cpp b/engines/testbed/fs.cpp index e2bedb1898..62ac616192 100644 --- a/engines/testbed/fs.cpp +++ b/engines/testbed/fs.cpp @@ -167,7 +167,7 @@ TestExitStatus FStests::testWriteFile() { return kTestPassed; } - return kTestFailed; + return kTestFailed; } @@ -189,7 +189,7 @@ FSTestSuite::FSTestSuite() { } void FSTestSuite::enable(bool flag) { - Testsuite::enable(ConfParams.isGameDataFound() & flag); + Testsuite::enable(ConfParams.isGameDataFound() ? flag : false); } } // End of namespace Testbed diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp index b38b83f222..36ec726fc7 100644 --- a/engines/testbed/graphics.cpp +++ b/engines/testbed/graphics.cpp @@ -102,7 +102,7 @@ void GFXtests::initMousePalette() { CursorMan.replaceCursorPalette(palette, 0, 3); } -Common::Rect GFXtests::computeSize(Common::Rect &cursorRect, int scalingFactor, int cursorTargetScale) { +Common::Rect GFXtests::computeSize(const Common::Rect &cursorRect, int scalingFactor, int cursorTargetScale) { if (cursorTargetScale == 1 || scalingFactor == 1) { // Game data and cursor would be scaled equally. // so dimensions would be same. @@ -137,7 +137,7 @@ void GFXtests::HSVtoRGB(int &rComp, int &gComp, int &bComp, int hue, int sat, in float f, p, q, t; if (s == 0) { - r = g = b = v * 255; + rComp = gComp = bComp = (int)(v * 255); return; } @@ -186,7 +186,7 @@ void GFXtests::HSVtoRGB(int &rComp, int &gComp, int &bComp, int hue, int sat, in bComp = (int)(b * 255); } -Common::Rect GFXtests::drawCursor(bool cursorPaletteDisabled, const char *gfxModeName, int cursorTargetScale) { +Common::Rect GFXtests::drawCursor(bool cursorPaletteDisabled, int cursorTargetScale) { // Buffer initialized with yellow color byte buffer[500]; memset(buffer, 2, sizeof(buffer)); @@ -244,12 +244,12 @@ void rotatePalette(byte *palette, int size) { */ void GFXtests::setupMouseLoop(bool disableCursorPalette, const char *gfxModeName, int cursorTargetScale) { bool isFeaturePresent; - isFeaturePresent = g_system->hasFeature(OSystem::kFeatureCursorHasPalette); + isFeaturePresent = g_system->hasFeature(OSystem::kFeatureCursorPalette); Common::Rect cursorRect; if (isFeaturePresent) { - cursorRect = GFXtests::drawCursor(disableCursorPalette, gfxModeName, cursorTargetScale); + cursorRect = GFXtests::drawCursor(disableCursorPalette, cursorTargetScale); Common::EventManager *eventMan = g_system->getEventManager(); Common::Event event; @@ -741,7 +741,7 @@ TestExitStatus GFXtests::scaledCursors() { if (isAspectRatioCorrected) { info += "\nDisabling Aspect ratio correction, for letting cusors match exactly, will be restored after this test."; } - + if (Testsuite::handleInteractiveInput(info, "OK", "Skip", kOptionRight)) { Testsuite::logPrintf("Info! Skipping test : Scaled Cursors\n"); return kTestSkipped; @@ -753,7 +753,7 @@ TestExitStatus GFXtests::scaledCursors() { } - if (isAspectRatioCorrected) { + if (isAspectRatioCorrected) { g_system->beginGFXTransaction(); g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, false); g_system->endGFXTransaction(); @@ -766,7 +766,7 @@ TestExitStatus GFXtests::scaledCursors() { // for every graphics mode display cursors for cursorTargetScale 1, 2 and 3 // Switch Graphics mode // FIXME: Crashes with "3x" mode now.: - + info = Common::String::format("Testing : Scaled cursors with GFX Mode %s\n", gfxMode->name); if (Testsuite::handleInteractiveInput(info, "OK", "Skip", kOptionRight)) { Testsuite::logPrintf("\tInfo! Skipping sub-test : Scaled Cursors :: GFX Mode %s\n", gfxMode->name); @@ -779,7 +779,7 @@ TestExitStatus GFXtests::scaledCursors() { Testsuite::logPrintf("Info! Explicit exit requested during scaling test, this test may be incomplete\n"); return kTestSkipped; } - + g_system->beginGFXTransaction(); bool isGFXModeSet = g_system->setGraphicsMode(gfxMode->id); @@ -807,7 +807,7 @@ TestExitStatus GFXtests::scaledCursors() { if (Testsuite::handleInteractiveInput(info, "Yes", "No", kOptionRight)) { Testsuite::logPrintf("\tInfo! Failed sub-test : Scaled Cursors :: GFX Mode %s\n", gfxMode->name); } - + if (Engine::shouldQuit()) { // Explicit exit requested Testsuite::logPrintf("Info! Explicit exit requested during scaling test, this test may be incomplete\n"); @@ -824,7 +824,7 @@ TestExitStatus GFXtests::scaledCursors() { if (isAspectRatioCorrected) { g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, true); } - + OSystem::TransactionError gfxError = g_system->endGFXTransaction(); if (gfxError != OSystem::kTransactionSuccess || !isGFXModeSet) { @@ -962,13 +962,14 @@ TestExitStatus GFXtests::paletteRotation() { Testsuite::logPrintf("Info! Skipping test : palette Rotation\n"); return kTestSkipped; } - Common::Point pt(0, 10); + Testsuite::clearEntireScreen(); // Use 256 colors byte palette[256 * 3] = {0}; int r, g, b; + r = g = b = 0; int colIndx; for (int i = 0; i < 256; i++) { @@ -1065,7 +1066,6 @@ TestExitStatus GFXtests::pixelFormats() { } Common::List<Graphics::PixelFormat> pfList = g_system->getSupportedFormats(); - Common::List<Graphics::PixelFormat>::const_iterator iter = pfList.begin(); int numFormatsTested = 0; int numPassed = 0; @@ -1073,7 +1073,7 @@ TestExitStatus GFXtests::pixelFormats() { Testsuite::logDetailedPrintf("Testing Pixel Formats. Size of list : %d\n", pfList.size()); - for (iter = pfList.begin(); iter != pfList.end(); iter++) { + for (Common::List<Graphics::PixelFormat>::const_iterator iter = pfList.begin(); iter != pfList.end(); iter++) { numFormatsTested++; if (iter->bytesPerPixel == 1) { // Palettes already tested diff --git a/engines/testbed/graphics.h b/engines/testbed/graphics.h index 7fa8f9d708..f3013fdf53 100644 --- a/engines/testbed/graphics.h +++ b/engines/testbed/graphics.h @@ -32,9 +32,9 @@ namespace GFXtests { void drawEllipse(int x, int y, int a, int b); void setupMouseLoop(bool disableCursorPalette = false, const char *gfxModeName = "", int cursorTargetScale = 1); void initMousePalette(); -Common::Rect computeSize(Common::Rect &cursorRect, int scalingFactor, int cursorTargetScale); +Common::Rect computeSize(const Common::Rect &cursorRect, int scalingFactor, int cursorTargetScale); void HSVtoRGB(int &rComp, int &gComp, int &bComp, int hue, int sat, int val); -Common::Rect drawCursor(bool cursorPaletteDisabled = false, const char *gfxModeName = "", int cursorTargetScale = 1); +Common::Rect drawCursor(bool cursorPaletteDisabled = false, int cursorTargetScale = 1); // will contain function declarations for GFX tests TestExitStatus cursorTrails(); diff --git a/engines/testbed/midi.cpp b/engines/testbed/midi.cpp index 54be866b4c..69d361b0d6 100644 --- a/engines/testbed/midi.cpp +++ b/engines/testbed/midi.cpp @@ -142,12 +142,12 @@ MidiTestSuite::MidiTestSuite() { // add some fallback test if filesystem loading failed Testsuite::logPrintf("Warning! Midi: Sound data file music.mid not found\n"); _isMidiDataFound = false; - enable(false); + MidiTestSuite::enable(false); } } void MidiTestSuite::enable(bool flag) { - Testsuite::enable(_isMidiDataFound & flag); + Testsuite::enable(_isMidiDataFound ? flag : false); } } diff --git a/engines/testbed/misc.cpp b/engines/testbed/misc.cpp index 35b3c6bfe2..034d3eb27e 100644 --- a/engines/testbed/misc.cpp +++ b/engines/testbed/misc.cpp @@ -24,13 +24,12 @@ namespace Testbed { -Common::String MiscTests::getHumanReadableFormat(TimeDate &td) { +Common::String MiscTests::getHumanReadableFormat(const TimeDate &td) { return Common::String::format("%d:%d:%d on %d/%d/%d (dd/mm/yyyy)", td.tm_hour, td.tm_min, td.tm_sec, td.tm_mday, td.tm_mon + 1, td.tm_year + 1900); } void MiscTests::timerCallback(void *arg) { // Increment arg which actually points to an int - // arg must point to a static data, threads otherwise have their own stack int &valToModify = *((int *) arg); valToModify = 999; // some arbitrary value } @@ -110,7 +109,7 @@ TestExitStatus MiscTests::testDateTime() { } TestExitStatus MiscTests::testTimers() { - static int valToModify = 0; + int valToModify = 0; if (g_system->getTimerManager()->installTimerProc(timerCallback, 100000, &valToModify)) { g_system->delayMillis(150); g_system->getTimerManager()->removeTimerProc(timerCallback); @@ -132,7 +131,7 @@ TestExitStatus MiscTests::testMutexes() { Testsuite::writeOnScreen("Installing mutex", Common::Point(0, 100)); } - static SharedVars sv = {1, 1, true, g_system->createMutex()}; + SharedVars sv = {1, 1, true, g_system->createMutex()}; if (g_system->getTimerManager()->installTimerProc(criticalSection, 100000, &sv)) { g_system->delayMillis(150); diff --git a/engines/testbed/misc.h b/engines/testbed/misc.h index 415fe82903..3f0772c6e5 100644 --- a/engines/testbed/misc.h +++ b/engines/testbed/misc.h @@ -40,7 +40,7 @@ namespace MiscTests { // Miscellaneous tests include testing datetime, timers and mutexes // Helper functions for Misc tests -Common::String getHumanReadableFormat(TimeDate &td); +Common::String getHumanReadableFormat(const TimeDate &td); void timerCallback(void *arg); void criticalSection(void *arg); diff --git a/engines/testbed/savegame.cpp b/engines/testbed/savegame.cpp index b19c8e3872..226e9880a6 100644 --- a/engines/testbed/savegame.cpp +++ b/engines/testbed/savegame.cpp @@ -133,11 +133,11 @@ TestExitStatus SaveGametests::testListingSavefile() { writeDataToFile("tBedSavefileToList.1", "Save me!"); writeDataToFile("tBedSavefileToList.2", "Save me!"); - Common::Error error = saveFileMan->getError(); + Common::Error err = saveFileMan->getError(); - if (error.getCode() != Common::kNoError) { + if (err.getCode() != Common::kNoError) { // Abort. Some Error in writing files - Testsuite::logDetailedPrintf("Error while creating savefiles: %s\n", error.getDesc().c_str()); + Testsuite::logDetailedPrintf("Error while creating savefiles: %s\n", err.getDesc().c_str()); return kTestFailed; } @@ -158,11 +158,9 @@ TestExitStatus SaveGametests::testListingSavefile() { } } return kTestPassed; - } else { - Testsuite::logDetailedPrintf("listing Savefiles failed!\n"); - return kTestFailed; } + Testsuite::logDetailedPrintf("listing Savefiles failed!\n"); return kTestFailed; } @@ -173,8 +171,8 @@ TestExitStatus SaveGametests::testErrorMessages() { // Try opening a non existing file readAndVerifyData("tBedSomeNonExistentSaveFile.0", "File doesn't exists!"); - Common::Error error = saveFileMan->getError(); - if (error.getCode() == Common::kNoError) { + Common::Error err = saveFileMan->getError(); + if (err.getCode() == Common::kNoError) { // blunder! how come? Testsuite::logDetailedPrintf("SaveFileMan.getError() failed\n"); return kTestFailed; diff --git a/engines/testbed/sound.h b/engines/testbed/sound.h index 76d0c7bb61..fea7d9d45b 100644 --- a/engines/testbed/sound.h +++ b/engines/testbed/sound.h @@ -69,10 +69,6 @@ public: const char *getDescription() const { return "Sound Subsystem"; } - -private: - bool _isTestDataFound; - }; } // End of namespace Testbed diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp index 41a705e292..152764eb27 100644 --- a/engines/testbed/testbed.cpp +++ b/engines/testbed/testbed.cpp @@ -76,12 +76,16 @@ void TestbedExitDialog::init() { void TestbedExitDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) { switch (cmd) { + default: + break; + case kCmdRerunTestbed : ConfParams.setRerunFlag(true); cmd = GUI::kCloseCmd; - default: - GUI::Dialog::handleCommand(sender, cmd, data); + break; } + + GUI::Dialog::handleCommand(sender, cmd, data); } bool TestbedEngine::hasFeature(EngineFeature f) const { diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp index 77211b3e64..655179aa74 100644 --- a/engines/testbed/testsuite.cpp +++ b/engines/testbed/testsuite.cpp @@ -113,7 +113,7 @@ bool Testsuite::handleInteractiveInput(const Common::String &textToDisplay, cons return prompt.runModal() == result ? true : false; } -void Testsuite::displayMessage(const Common::String &textToDisplay, const char *defaultButton, const char *altButton) { +void Testsuite::displayMessage(const Common::String &textToDisplay, const char *defaultButton) { GUI::MessageDialog prompt(textToDisplay, defaultButton); prompt.runModal(); } @@ -214,10 +214,11 @@ uint Testsuite::parseEvents() { return kSkipNext; } break; + case Common::EVENT_QUIT: case Common::EVENT_RTL: return kEngineQuit; - break; + default: break; } diff --git a/engines/testbed/testsuite.h b/engines/testbed/testsuite.h index 3a3a78b9bb..dc159ce25f 100644 --- a/engines/testbed/testsuite.h +++ b/engines/testbed/testsuite.h @@ -112,7 +112,7 @@ public: */ static bool handleInteractiveInput(const Common::String &textToDisplay, const char *opt1 = "Yes", const char *opt2 = "No", OptionSelected result = kOptionLeft); - static void displayMessage(const Common::String &textToDisplay, const char *defaultButton = "OK", const char *altButton = 0); + static void displayMessage(const Common::String &textToDisplay, const char *defaultButton = "OK"); static Common::Rect writeOnScreen(const Common::String &textToDisplay, const Common::Point &pt, bool flag = false); static void clearScreen(const Common::Rect &rect); static void clearEntireScreen() { @@ -145,7 +145,7 @@ public: static void logPrintf(const char *s, ...) GCC_PRINTF(1, 2); static void logDetailedPrintf(const char *s, ...) GCC_PRINTF(1, 2); - + // Progress bar (Information Display) related methods. /** * Display region is in the bottom. Probably 1/4th of the game screen. @@ -180,7 +180,7 @@ protected: bool _isTsEnabled; private: - + /** * Used from the code to decide if the engine needs to exit */ diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 0f0e3cd1ef..59a567bc63 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -63,7 +63,7 @@ uint16 TinselEngine::getVersion() const { return _gameDescription->version; } -} +} // End of namespace Tinsel static const PlainGameDescriptor tinselGames[] = { {"tinsel", "Tinsel engine game"}, @@ -74,34 +74,11 @@ static const PlainGameDescriptor tinselGames[] = { #include "tinsel/detection_tables.h" -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Tinsel::gameDescriptions, - // Size of that superset structure - sizeof(Tinsel::TinselGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - tinselGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "tinsel", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - class TinselMetaEngine : public AdvancedMetaEngine { public: - TinselMetaEngine() : AdvancedMetaEngine(detectionParams) {} + TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { + params.singleid = "tinsel"; + } virtual const char *getName() const { return "Tinsel"; @@ -265,7 +242,7 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & if (testFile.open(allFiles[fname])) { tmp.size = (int32)testFile.size(); - tmp.md5 = computeStreamMD5AsString(testFile, detectionParams.md5Bytes); + tmp.md5 = computeStreamMD5AsString(testFile, params.md5Bytes); } else { tmp.size = -1; } @@ -285,7 +262,7 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & bool fileMissing = false; - if ((detectionParams.flags & kADFlagUseExtraAsHint) && !extra.empty() && g->desc.extra != extra) + if ((params.flags & kADFlagUseExtraAsHint) && !extra.empty() && g->desc.extra != extra) continue; bool allFilesPresent = true; diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp index ae67d1900e..0bf3316209 100644 --- a/engines/toon/audio.cpp +++ b/engines/toon/audio.cpp @@ -232,8 +232,8 @@ AudioStreamInstance::AudioStreamInstance(AudioManager *man, Audio::Mixer *mixer, _mixer = mixer; _compBuffer = NULL; _bufferOffset = 0; - _lastADPCMval1 = 0; - _lastADPCMval2 = 0; + _lastSample = 0; + _lastStepIndex = 0; _file = stream; _fadingIn = false; _fadingOut = false; @@ -307,8 +307,8 @@ bool AudioStreamInstance::readPacket() { if (_looping) { _file->seek(8); _currentReadSize = 8; - _lastADPCMval1 = 0; - _lastADPCMval2 = 0; + _lastSample = 0; + _lastStepIndex = 0; } else { _bufferSize = 0; stopNow(); @@ -342,52 +342,49 @@ bool AudioStreamInstance::readPacket() { void AudioStreamInstance::decodeADPCM(uint8 *comp, int16 *dest, int32 packetSize) { debugC(5, kDebugAudio, "decodeADPCM(comp, dest, %d)", packetSize); + // standard IMA ADPCM decoding int32 numSamples = 2 * packetSize; - int32 v18 = _lastADPCMval1; - int32 v19 = _lastADPCMval2; + int32 samp = _lastSample; + int32 stepIndex = _lastStepIndex; for (int32 i = 0; i < numSamples; i++) { uint8 comm = *comp; + bool isOddSample = (i & 1); - int32 v29 = i & 1; - int32 v30; - if (v29 == 0) - v30 = comm & 0xf; + uint8 code; + if (!isOddSample) + code = comm & 0xf; else - v30 = (comm & 0xf0) >> 4; + code = (comm & 0xf0) >> 4; - int32 v31 = v30 & 0x8; - int32 v32 = v30 & 0x7; - int32 v33 = Audio::Ima_ADPCMStream::_imaTable[v19]; - int32 v34 = v33 >> 3; - if (v32 & 4) - v34 += v33; + uint8 sample = code & 0x7; - if (v32 & 2) - v34 += v33 >> 1; + int32 step = Audio::Ima_ADPCMStream::_imaTable[stepIndex]; + int32 E = step >> 3; + if (sample & 4) + E += step; + if (sample & 2) + E += step >> 1; + if (sample & 1) + E += step >> 2; - if (v32 & 1) - v34 += v33 >> 2; + stepIndex += Audio::ADPCMStream::_stepAdjustTable[sample]; + stepIndex = CLIP<int32>(stepIndex, 0, ARRAYSIZE(Audio::Ima_ADPCMStream::_imaTable) - 1); - v19 += Audio::ADPCMStream::_stepAdjustTable[v32]; - v19 = CLIP<int32>(v19, 0, ARRAYSIZE(Audio::Ima_ADPCMStream::_imaTable) - 1); - - if (v31) - v18 -= v34; + if (code & 0x8) + samp -= E; else - v18 += v34; + samp += E; - if (v18 > 32767) - v18 = 32767; - else if (v18 < -32768) - v18 = -32768; + samp = CLIP<int32>(samp, -32768, 32767); - *dest = v18; - comp += v29; + *dest = samp; + if (isOddSample) + comp++; dest++; } - _lastADPCMval1 = v18; - _lastADPCMval2 = v19; + _lastSample = samp; + _lastStepIndex = stepIndex; } void AudioStreamInstance::play(bool fade, Audio::Mixer::SoundType soundType) { diff --git a/engines/toon/audio.h b/engines/toon/audio.h index 52ca21b075..61a534265e 100644 --- a/engines/toon/audio.h +++ b/engines/toon/audio.h @@ -84,8 +84,8 @@ protected: Audio::SoundHandle _handle; Audio::Mixer::SoundType _soundType; Audio::Mixer *_mixer; - int32 _lastADPCMval1; - int32 _lastADPCMval2; + int32 _lastSample; + int32 _lastStepIndex; bool _stopped; AudioManager *_man; int32 _totalSize; diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 1056f6ec0d..8ddfcd4fed 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -28,7 +28,7 @@ #include "graphics/thumbnail.h" #include "toon/toon.h" -static const PlainGameDescriptor ToonGames[] = { +static const PlainGameDescriptor toonGames[] = { { "toon", "Toonstruck" }, { 0, 0 } }; @@ -117,35 +117,14 @@ static const char * const directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Toon::gameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 5000, - // List of all engine targets - ToonGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "toon", - // List of files for file-based fallback detection (optional) - Toon::fileBasedFallback, - // Flags - 0, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 3, - // List of directory globs - directoryGlobs -}; - class ToonMetaEngine : public AdvancedMetaEngine { public: - ToonMetaEngine() : AdvancedMetaEngine(detectionParams) {} - + ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { + params.singleid = "toon"; + params.fileBasedFallback = Toon::fileBasedFallback; + params.depth = 3; + params.directoryGlobs = directoryGlobs; + } virtual const char *getName() const { return "Toon"; } diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 93da20fb47..0e0978b3d6 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -28,6 +28,7 @@ #include "common/savefile.h" #include "common/memstream.h" +#include "engines/advancedDetector.h" #include "engines/util.h" #include "graphics/palette.h" #include "graphics/surface.h" diff --git a/engines/toon/toon.h b/engines/toon/toon.h index 02828f26d1..65c6ba0234 100644 --- a/engines/toon/toon.h +++ b/engines/toon/toon.h @@ -23,7 +23,6 @@ #ifndef TOON_TOON_H #define TOON_TOON_H -#include "engines/advancedDetector.h" #include "engines/engine.h" #include "graphics/surface.h" #include "common/random.h" @@ -44,6 +43,8 @@ namespace Common { class MemoryWriteStreamDynamic; } +struct ADGameDescription; + #define TOON_DAT_VER_MAJ 0 // 1 byte #define TOON_DAT_VER_MIN 3 // 1 byte #define TOON_SAVEGAME_VERSION 4 diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index b7f9c092aa..3e324b5685 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -126,35 +126,16 @@ static const char *directoryGlobs[] = { 0 }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)Touche::gameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 4096, - // List of all engine targets - toucheGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "touche", - // List of files for file-based fallback detection (optional) - Touche::fileBasedFallback, - // Flags - kADFlagPrintWarningOnFileBasedFallback, - // Additional GUI options (for every game} - Common::GUIO_NONE, - // Maximum directory depth - 2, - // List of directory globs - directoryGlobs -}; - class ToucheMetaEngine : public AdvancedMetaEngine { public: - ToucheMetaEngine() : AdvancedMetaEngine(detectionParams) {} - + ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { + params.md5Bytes = 4096; + params.singleid = "touche"; + params.fileBasedFallback = Touche::fileBasedFallback; + params.flags = kADFlagPrintWarningOnFileBasedFallback; + params.depth = 2; + params.directoryGlobs = directoryGlobs; + } virtual const char *getName() const { return "Touche"; } diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index ae337765a2..ed2b03ebc4 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -521,24 +521,30 @@ void PlayerMover::pathfind(Common::Point *routeList, Common::Point srcPos, Commo break; } - int var6; - proc1(routeRegions, srcRegion, destRegion, var6); + bool tempVar; // This is used only as internal state for the function. + calculateRestOfRoute(routeRegions, srcRegion, destRegion, tempVar); + // Empty route? if (!routeRegions[0]) { regionIndexes.push_back(destRegion); continue; } - _globals->_walkRegions._field18[0]._pt1 = srcPos; - _globals->_walkRegions._field18[0]._pt2 = srcPos; - _globals->_walkRegions._field18[1]._pt1 = destPos; - _globals->_walkRegions._field18[1]._pt2 = destPos; + // field 0 holds the start, and field 1 holds the destination + WRField18 &currSrcField = _globals->_walkRegions._field18[0]; + WRField18 &currDestField = _globals->_walkRegions._field18[1]; + + currSrcField._pt1 = srcPos; + currSrcField._pt2 = srcPos; + currDestField._pt1 = destPos; + currDestField._pt2 = destPos; int tempList[REGION_LIST_SIZE]; tempList[0] = 0; int endIndex = 0; int idx = 1; + // Find the indexes for each entry in the found route. do { int breakEntry = routeRegions[idx]; int breakEntry2 = routeRegions[idx + 1]; @@ -556,49 +562,52 @@ void PlayerMover::pathfind(Common::Point *routeList, Common::Point srcPos, Commo tempList[idx] = 1; for (int listIndex = 1; listIndex <= endIndex; ++listIndex) { - int var10 = tempList[listIndex]; - int var12 = tempList[listIndex + 1]; + int thisIdx = tempList[listIndex]; + int nextIdx = tempList[listIndex + 1]; + + WRField18 &thisField = _globals->_walkRegions._field18[thisIdx]; + WRField18 &nextField = _globals->_walkRegions._field18[nextIdx]; - if (sub_F8E5(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[var12]._pt1, - _globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[var10]._pt2) && - sub_F8E5(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[var12]._pt2, - _globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[var10]._pt2)) + if (sub_F8E5_calculatePoint(currSrcField._pt1, nextField._pt1, + thisField._pt1, thisField._pt2) && + sub_F8E5_calculatePoint(currSrcField._pt1, nextField._pt2, + thisField._pt1, thisField._pt2)) continue; Common::Point tempPt; - if (sub_F8E5(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[1]._pt1, - _globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[var10]._pt2, &tempPt)) { + if (sub_F8E5_calculatePoint(currSrcField._pt1, currDestField._pt1, + thisField._pt1, thisField._pt2, &tempPt)) { // Add point to the route list - _globals->_walkRegions._field18[0]._pt1 = tempPt; + currSrcField._pt1 = tempPt; *routeList++ = tempPt; } else { - int v16 = - (findDistance(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[var10]._pt1) << 1) + - (findDistance(_globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[1]._pt1) << 1) + - findDistance(_globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[var12]._pt1) + - findDistance(_globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[var12]._pt2); - - int v1A = - (findDistance(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[var10]._pt2) << 1) + - (findDistance(_globals->_walkRegions._field18[var10]._pt2, _globals->_walkRegions._field18[1]._pt2) << 1) + - findDistance(_globals->_walkRegions._field18[var10]._pt2, _globals->_walkRegions._field18[var12]._pt1) + - findDistance(_globals->_walkRegions._field18[var10]._pt2, _globals->_walkRegions._field18[var12]._pt2); - - if (v16 < v1A) { - checkMovement2(_globals->_walkRegions._field18[var10]._pt1, - _globals->_walkRegions._field18[var10]._pt2, 1, objPos); + int dist1 = + (findDistance(currSrcField._pt1, thisField._pt1) << 1) + + (findDistance(thisField._pt1, currDestField._pt1) << 1) + + findDistance(thisField._pt1, nextField._pt1) + + findDistance(thisField._pt1, nextField._pt2); + + int dist2 = + (findDistance(currSrcField._pt1, thisField._pt2) << 1) + + (findDistance(thisField._pt2, currDestField._pt2) << 1) + + findDistance(thisField._pt2, nextField._pt1) + + findDistance(thisField._pt2, nextField._pt2); + + // Do 1 step of movement, storing the new position in objPos. + if (dist1 < dist2) { + doStepsOfNpcMovement(thisField._pt1, thisField._pt2, 1, objPos); } else { - checkMovement2(_globals->_walkRegions._field18[var10]._pt2, - _globals->_walkRegions._field18[var10]._pt1, 1, objPos); + doStepsOfNpcMovement(thisField._pt2, thisField._pt1, 1, objPos); } - _globals->_walkRegions._field18[0]._pt1 = objPos; + // Update the current position. + currSrcField._pt1 = objPos; *routeList++ = objPos; } } // Add in the route entry - *routeList++ = _globals->_walkRegions._field18[1]._pt1; + *routeList++ = currDestField._pt1; } // Mark the end of the path @@ -746,7 +755,7 @@ int PlayerMover::checkMover(Common::Point &srcPos, const Common::Point &destPos) return regionIndex; } -void PlayerMover::checkMovement2(const Common::Point &srcPos, const Common::Point &destPos, int numSteps, Common::Point &ptOut) { +void PlayerMover::doStepsOfNpcMovement(const Common::Point &srcPos, const Common::Point &destPos, int numSteps, Common::Point &ptOut) { Common::Point objPos = _sceneObject->_position; _sceneObject->_position = srcPos; uint32 regionBitList = _sceneObject->_regionBitList; @@ -771,9 +780,10 @@ void PlayerMover::checkMovement2(const Common::Point &srcPos, const Common::Poin _sceneObject->_mover = this; } -int PlayerMover::proc1(int *routeList, int srcRegion, int destRegion, int &v) { +int PlayerMover::calculateRestOfRoute(int *routeList, int srcRegion, int destRegion, bool &foundRoute) { + // Make a copy of the provided route. The first entry is the size. int tempList[REGION_LIST_SIZE + 1]; - v = 0; + foundRoute = false; for (int idx = 0; idx <= *routeList; ++idx) tempList[idx] = routeList[idx]; @@ -791,24 +801,28 @@ int PlayerMover::proc1(int *routeList, int srcRegion, int destRegion, int &v) { WalkRegion &srcWalkRegion = _globals->_walkRegions[srcRegion]; int distance; if (!routeList[0]) { - // No route + // The route is empty (new route). distance = 0; } else { + // Find the distance from the last region in the route. WalkRegion ®ion = _globals->_walkRegions[routeList[*routeList]]; distance = findDistance(srcWalkRegion._pt, region._pt); } + // Add the srcRegion to the end of the route. tempList[++*tempList] = srcRegion; - int newIndex = *tempList; + int ourListSize = *tempList; if (srcRegion == destRegion) { - v = 1; - for (int idx = newIndex; idx <= *tempList; ++idx) { + // We made a route to the destination; copy that route and return. + foundRoute = true; + for (int idx = ourListSize; idx <= *tempList; ++idx) { routeList[idx] = tempList[idx]; ++*routeList; } return distance; } else { + // Find the first connected region leading to our destination. int foundIndex = 0; int idx = 0; int currDest; @@ -821,27 +835,32 @@ int PlayerMover::proc1(int *routeList, int srcRegion, int destRegion, int &v) { ++idx; } - int resultOffset = 31990; - while (((currDest = _globals->_walkRegions._idxList[srcWalkRegion._idxListIndex + foundIndex]) != 0) && (v == 0)) { - int newDistance = proc1(tempList, currDest, destRegion, v); + // Check every connected region until we find a route to the destination (or we have no more to check). + int bestDistance = 31990; + while (((currDest = _globals->_walkRegions._idxList[srcWalkRegion._idxListIndex + foundIndex]) != 0) && (!foundRoute)) { + int newDistance = calculateRestOfRoute(tempList, currDest, destRegion, foundRoute); - if ((newDistance <= resultOffset) || v) { - routeList[0] = newIndex - 1; + if ((newDistance <= bestDistance) || foundRoute) { + // We found a shorter possible route, or one leading to the destination. - for (int i = newIndex; i <= tempList[0]; ++i) { + // Overwrite the route with this new one. + routeList[0] = ourListSize - 1; + + for (int i = ourListSize; i <= tempList[0]; ++i) { routeList[i] = tempList[i]; ++routeList[0]; } - resultOffset = newDistance; + bestDistance = newDistance; } - tempList[0] = newIndex; + // Truncate our local list to the size it was before the call. + tempList[0] = ourListSize; ++foundIndex; } - v = 0; - return resultOffset + distance; + foundRoute = false; + return bestDistance + distance; } } @@ -855,71 +874,62 @@ int PlayerMover::findDistance(const Common::Point &pt1, const Common::Point &pt2 return (int)sqrt(xx + yy); } -bool PlayerMover::sub_F8E5(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3, +bool PlayerMover::sub_F8E5_calculatePoint(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3, const Common::Point &pt4, Common::Point *ptOut) { - double diff1 = pt2.x - pt1.x; - double diff2 = pt2.y - pt1.y; - double diff3 = pt4.x - pt3.x; - double diff4 = pt4.y - pt3.y; - double var10 = 0.0, var8 = 0.0; - double var18 = 0.0, var20 = 0.0; + double diffX1 = pt2.x - pt1.x; + double diffY1 = pt2.y - pt1.y; + double diffX2 = pt4.x - pt3.x; + double diffY2 = pt4.y - pt3.y; + double ratio1 = 0.0, ratio2 = 0.0; + double adjustedY1 = 0.0, adjustedY2 = 0.0; - if (diff1 != 0.0) { - var8 = diff2 / diff1; - var18 = pt1.y - (pt1.x * var8); + // Calculate the ratios between the X and Y points. + if (diffX1 != 0.0) { + ratio1 = diffY1 / diffX1; + adjustedY1 = pt1.y - (pt1.x * ratio1); } - if (diff3 != 0.0) { - var10 = diff4 / diff3; - var20 = pt3.y - (pt3.x * var10); + if (diffX2 != 0.0) { + ratio2 = diffY2 / diffX2; + adjustedY2 = pt3.y - (pt3.x * ratio2); } - if (var8 == var10) + if (ratio1 == ratio2) return false; - double var48, var50; - if (diff1 == 0) { - if (diff3 == 0) + double xPos, yPos; + if (diffX1 == 0) { + if (diffX2 == 0) return false; - var48 = pt1.x; - var50 = var10 * var48 + var20; + xPos = pt1.x; + yPos = ratio2 * xPos + adjustedY2; } else { - var48 = (diff3 == 0) ? pt3.x : (var20 - var18) / (var8 - var10); - var50 = var8 * var48 + var18; + xPos = (diffX2 == 0) ? pt3.x : (adjustedY2 - adjustedY1) / (ratio1 - ratio2); + yPos = ratio1 * xPos + adjustedY1; } - bool var52 = false, var56 = false, var54 = false, var58 = false; - Common::Point tempPt((int)(var48 + 0.5), (int)(var50 + 0.5)); + // This is our candidate point, which we must check for validity. + Common::Point tempPt((int)(xPos + 0.5), (int)(yPos + 0.5)); - if ((tempPt.x >= pt3.x) && (tempPt.x <= pt4.x)) - var56 = true; - else if ((tempPt.x >= pt4.x) && (tempPt.x <= pt3.x)) - var56 = true; - if (var56) { - if ((tempPt.y >= pt3.y) && (tempPt.y <= pt4.y)) - var58 = true; - else if ((tempPt.y >= pt4.y) && (tempPt.y <= pt3.y)) - var58 = true; - } - - if ((tempPt.x >= pt1.x) && (tempPt.x <= pt2.x)) - var52 = true; - else if ((tempPt.x >= pt2.x) && (tempPt.x <= pt1.x)) - var52 = true; - if (var52) { - if ((tempPt.y >= pt1.y) && (tempPt.y <= pt2.y)) - var54 = true; - else if ((tempPt.y >= pt2.y) && (tempPt.y <= pt1.y)) - var54 = true; - } + // Is tempPt inside the second bounds? + if (!((tempPt.x >= pt3.x) && (tempPt.x <= pt4.x))) + if (!((tempPt.x >= pt4.x) && (tempPt.x <= pt3.x))) + return false; + if (!((tempPt.y >= pt3.y) && (tempPt.y <= pt4.y))) + if (!((tempPt.y >= pt4.y) && (tempPt.y <= pt3.y))) + return false; - if (var52 && var54 && var56 && var58) { - if (ptOut) - *ptOut = tempPt; - return true; - } + // Is tempPt inside the first bounds? + if (!((tempPt.x >= pt1.x) && (tempPt.x <= pt2.x))) + if (!((tempPt.x >= pt2.x) && (tempPt.x <= pt1.x))) + return false; + if (!((tempPt.y >= pt1.y) && (tempPt.y <= pt2.y))) + if (!((tempPt.y >= pt2.y) && (tempPt.y <= pt1.y))) + return false; - return false; + if (ptOut) + *ptOut = tempPt; + return true; } /*--------------------------------------------------------------------------*/ @@ -1353,6 +1363,8 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) { void ScenePalette::synchronize(Serializer &s) { if (s.getVersion() >= 2) SavedObject::synchronize(s); + if (s.getVersion() >= 5) + _listeners.synchronize(s); s.syncBytes(_palette, 256 * 3); s.syncAsSint32LE(_colors.foreground); @@ -2564,6 +2576,9 @@ void SceneText::synchronize(Serializer &s) { s.syncAsSint16LE(_color2); s.syncAsSint16LE(_color3); SYNC_ENUM(_textMode, TextAlign); + + if (s.getVersion() >= 5) + _textSurface.synchronize(s); } /*--------------------------------------------------------------------------*/ diff --git a/engines/tsage/core.h b/engines/tsage/core.h index 71130e5b0b..92907addbc 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -229,12 +229,12 @@ protected: int regionIndexOf(int xp, int yp) { return regionIndexOf(Common::Point(xp, yp)); } int findClosestRegion(Common::Point &pt, const Common::List<int> &indexList); int checkMover(Common::Point &srcPos, const Common::Point &destPos); - void checkMovement2(const Common::Point &pt1, const Common::Point &pt2, int numSteps, Common::Point &ptOut); - int proc1(int *routeList, int srcRegion, int destRegion, int &v); + void doStepsOfNpcMovement(const Common::Point &pt1, const Common::Point &pt2, int numSteps, Common::Point &ptOut); + int calculateRestOfRoute(int *routeList, int srcRegion, int destRegion, bool &foundRoute); static Common::Point *findLinePoint(RouteEnds *routeEnds, Common::Point *objPos, int length, Common::Point *outPos); static int findDistance(const Common::Point &pt1, const Common::Point &pt2); - static bool sub_F8E5(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3, + static bool sub_F8E5_calculatePoint(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3, const Common::Point &pt4, Common::Point *ptOut = NULL); public: Common::Point _finalDest; diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index 20c2002257..e9e80312b9 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -66,25 +66,16 @@ static const PlainGameDescriptor tSageGameTitles[] = { #include "engines/tsage/detection_tables.h" -static const ADParams detectionParams = { - (const byte *)tSage::gameDescriptions, - sizeof(tSage::tSageGameDescription), - 0, - tSageGameTitles, - 0, - "tsage", - NULL, - 0, - Common::GUIO_NONE, - 0, - NULL +enum { + MAX_SAVES = 100 }; -#define MAX_SAVES 100 - class TSageMetaEngine : public AdvancedMetaEngine { public: - TSageMetaEngine() : AdvancedMetaEngine(detectionParams) { + TSageMetaEngine() : AdvancedMetaEngine(tSage::gameDescriptions, sizeof(tSage::tSageGameDescription), tSageGameTitles) { + params.md5Bytes = 5000; + params.singleid = "tsage"; + params.guioptions = Common::GUIO_NOSPEECH; } virtual const char *getName() const { diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h index dc55f2a66d..fb97e40449 100644 --- a/engines/tsage/detection_tables.h +++ b/engines/tsage/detection_tables.h @@ -24,7 +24,7 @@ namespace tSage { static const tSageGameDescription gameDescriptions[] = { - // Ringworld English CD version + // Ringworld CD and First Wave versions { { "ring", @@ -38,26 +38,12 @@ static const tSageGameDescription gameDescriptions[] = { GType_Ringworld, GF_CD | GF_ALT_REGIONS }, - // Ringworld First Wave English CD version - { - { - "ring", - "CD", - AD_ENTRY1s("ring.rlb", "0a25b4ee58d44a54425c0b47e5096bbc", 37847618), - Common::EN_ANY, - Common::kPlatformPC, - ADGF_NO_FLAGS, - Common::GUIO_NONE - }, - GType_Ringworld, - GF_CD | GF_ALT_REGIONS - }, // Ringworld English Floppy version { { "ring", "Floppy", - AD_ENTRY1s("ring.rlb", "61f78f68a56832ae95fe06748c403234", 8438770), + AD_ENTRY1s("ring.rlb", "7b7f0c5b37b58fa5ec06ebb2ca0d0d9d", 8438770), Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, @@ -71,7 +57,7 @@ static const tSageGameDescription gameDescriptions[] = { { "ring", "Floppy Demo", - AD_ENTRY1s("tsage.rlb", "bf4e8525d0cab84b08b57126092eeacd", 833453), + AD_ENTRY1s("tsage.rlb", "3b3604a97c06c91f3735d3e9d341f63f", 833453), Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, @@ -80,6 +66,8 @@ static const tSageGameDescription gameDescriptions[] = { GType_Ringworld, GF_FLOPPY | GF_DEMO }, +#if 0 + // FIXME: Compute new MD5s based on 5000 bytes instead of 0 (unlimited) // Ringworld English Floppy Demo #2 version { { @@ -94,13 +82,13 @@ static const tSageGameDescription gameDescriptions[] = { GType_Ringworld, GF_FLOPPY | GF_DEMO | GF_ALT_REGIONS }, - - // Blue Force + // FIXME: Compute new MD5s based on 5000 bytes instead of 0 (unlimited) + // Blue Force floppy { { "blueforce", - "", - AD_ENTRY1s("blue.rlb", "467da43c848cc0e800b547c59d84ccb1", 10032614), + "Floppy", + AD_ENTRY1s("blue.rlb", "17c3993415e8a2cf93040eef7e88ec93", 1156508), Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, @@ -109,12 +97,13 @@ static const tSageGameDescription gameDescriptions[] = { GType_BlueForce, GF_FLOPPY }, - // Blue Force floppy +#endif + // Blue Force { { "blueforce", - "Floppy", - AD_ENTRY1s("blue.rlb", "17c3993415e8a2cf93040eef7e88ec93", 1156508), + "", + AD_ENTRY1s("blue.rlb", "17eabb456cb1546c66baf1aff387ba6a", 10032614), Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, @@ -128,7 +117,7 @@ static const tSageGameDescription gameDescriptions[] = { { "blueforce", "CD", - AD_ENTRY1s("blue.rlb", "ac29f38184cb3b874ea18523059872ba", 63863322), + AD_ENTRY1s("blue.rlb", "99983f48cb218f1f3760cf2f9a7ef11d", 63863322), Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp index 759deebbef..c1bd1d027f 100644 --- a/engines/tsage/dialogs.cpp +++ b/engines/tsage/dialogs.cpp @@ -43,21 +43,20 @@ MessageDialog::MessageDialog(const Common::String &message, const Common::String const Common::String &btn2Message) : GfxDialog() { // Set up the message addElements(&_msg, &_btn1, NULL); - + _msg.set(message, 200, ALIGN_LEFT); - _btn1._bounds.moveTo(_msg._bounds.left, _msg._bounds.bottom + 2); + _msg._bounds.moveTo(0, 0); _defaultButton = &_btn1; // Set up the first button _btn1.setText(btn1Message); - _btn1._bounds.moveTo(_msg._bounds.right - _btn1._bounds.width(), _msg._bounds.bottom); + _btn1._bounds.moveTo(_msg._bounds.right - _btn1._bounds.width(), _msg._bounds.bottom + 2); if (!btn2Message.empty()) { // Set up the second button - _defaultButton = &_btn2; add(&_btn2); _btn2.setText(btn2Message); - _btn2._bounds.moveTo(_msg._bounds.right - _btn2._bounds.width(), _msg._bounds.bottom); + _btn2._bounds.moveTo(_msg._bounds.right - _btn2._bounds.width(), _msg._bounds.bottom + 2); _btn1._bounds.translate(-(_btn2._bounds.width() + 4), 0); } @@ -82,8 +81,9 @@ int MessageDialog::show2(const Common::String &message, const Common::String &bt MessageDialog *dlg = new MessageDialog(message, btn1Message, btn2Message); dlg->draw(); - GfxButton *selectedButton = dlg->execute(); - int result = (selectedButton == &dlg->_btn1) ? 0 : 1; + GfxButton *defaultButton = !btn2Message.empty() ? &dlg->_btn2 : &dlg->_btn1; + GfxButton *selectedButton = dlg->execute(defaultButton); + int result = (selectedButton == defaultButton) ? 1 : 0; delete dlg; return result; @@ -473,7 +473,7 @@ void InventoryDialog::execute() { g_system->updateScreen(); } if (_vm->getEventManager()->shouldQuit()) - return; + break; hiliteObj = NULL; if ((event.eventType == EVENT_BUTTON_DOWN) && !_bounds.contains(event.mousePos)) diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp index e889c56c4d..9df2a7ccd6 100644 --- a/engines/tsage/events.cpp +++ b/engines/tsage/events.cpp @@ -304,4 +304,14 @@ void EventsClass::delay(int numFrames) { _priorFrameTime = g_system->getMillis(); } +void EventsClass::listenerSynchronize(Serializer &s) { + s.syncAsUint32LE(_frameNumber); + s.syncAsUint32LE(_prevDelayFrame); + + if (s.getVersion() >= 5) { + s.syncAsSint16LE(_currentCursor); + s.syncAsSint16LE(_lastCursor); + } +} + } // end of namespace tSage diff --git a/engines/tsage/events.h b/engines/tsage/events.h index 9a7bdbe82c..a13455d378 100644 --- a/engines/tsage/events.h +++ b/engines/tsage/events.h @@ -98,11 +98,7 @@ public: uint32 getFrameNumber() const { return _frameNumber; } void delay(int numFrames); - virtual void listenerSynchronize(Serializer &s) { - s.syncAsUint32LE(_frameNumber); - s.syncAsUint32LE(_prevDelayFrame); - // TODO: Synchronize unknown stuff - } + virtual void listenerSynchronize(Serializer &s); }; } // End of namespace tSage diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index e629396501..863f1458b1 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -50,33 +50,42 @@ static SavedObject *classFactoryProc(const Common::String &className) { /*--------------------------------------------------------------------------*/ -Globals::Globals() : - _dialogCenter(160, 140), - _gfxManagerInstance(_screenSurface), - _randomSource("tsage") { +Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface), + _randomSource("tsage"), _unkColor1(0), _unkColor2(255), _unkColor3(255) { reset(); _stripNum = 0; + _gfxEdgeAdjust = 3; if (_vm->getFeatures() & GF_DEMO) { _gfxFontNumber = 0; _gfxColors.background = 6; _gfxColors.foreground = 0; - _fontColors.background = 0; - _fontColors.foreground = 0; + _fontColors.background = 255; + _fontColors.foreground = 6; _dialogCenter.y = 80; + // Workaround in order to use later version of the engine + _unkColor1 = _gfxColors.foreground; + _unkColor2 = _gfxColors.foreground; + _unkColor3 = _gfxColors.foreground; } else if ((_vm->getGameID() == GType_Ringworld) && (_vm->getFeatures() & GF_CD)) { _gfxFontNumber = 50; _gfxColors.background = 53; _gfxColors.foreground = 0; _fontColors.background = 51; _fontColors.foreground = 54; - warning("TODO: Check the 3 additional colors"); + _unkColor1 = 18; + _unkColor2 = 18; + _unkColor3 = 18; } else { _gfxFontNumber = 50; _gfxColors.background = 53; _gfxColors.foreground = 18; _fontColors.background = 51; _fontColors.foreground = 54; + // Workaround in order to use later version of the engine + _unkColor1 = _gfxColors.foreground; + _unkColor2 = _gfxColors.foreground; + _unkColor3 = _gfxColors.foreground; } _screenSurface.setScreenSurface(); _gfxManagers.push_back(&_gfxManagerInstance); @@ -131,6 +140,12 @@ void Globals::synchronize(Serializer &s) { s.syncAsSint32LE(_gfxColors.foreground); s.syncAsSint32LE(_fontColors.background); s.syncAsSint32LE(_fontColors.foreground); + + if (s.getVersion() >= 4) { + s.syncAsByte(_unkColor1); + s.syncAsByte(_unkColor2); + s.syncAsByte(_unkColor3); + } s.syncAsSint16LE(_dialogCenter.x); s.syncAsSint16LE(_dialogCenter.y); _sceneListeners.synchronize(s); diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 6b3df587b6..8212387ed1 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -51,6 +51,7 @@ public: int _gfxFontNumber; GfxColors _gfxColors; GfxColors _fontColors; + byte _unkColor1, _unkColor2, _unkColor3; SoundManager _soundManager; Common::Point _dialogCenter; WalkRegions _walkRegions; @@ -67,6 +68,7 @@ public: SequenceManager _sequenceManager; Common::RandomSource _randomSource; int _stripNum; + int _gfxEdgeAdjust; public: Globals(); ~Globals(); diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index cc11343c9c..25dc897ecd 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -304,6 +304,43 @@ void GfxSurface::unlockSurface() { } } +void GfxSurface::synchronize(Serializer &s) { + assert(!_lockSurfaceCtr); + assert(!_screenSurface); + + s.syncAsByte(_disableUpdates); + _bounds.synchronize(s); + s.syncAsSint16LE(_centroid.x); + s.syncAsSint16LE(_centroid.y); + s.syncAsSint16LE(_transColor); + + if (s.isSaving()) { + // Save contents of the surface + if (_customSurface) { + s.syncAsSint16LE(_customSurface->w); + s.syncAsSint16LE(_customSurface->h); + s.syncBytes((byte *)_customSurface->pixels, _customSurface->w * _customSurface->h); + } else { + int zero = 0; + s.syncAsSint16LE(zero); + s.syncAsSint16LE(zero); + } + } else { + int w, h; + s.syncAsSint16LE(w); + s.syncAsSint16LE(h); + + if ((w == 0) || (h == 0)) { + if (_customSurface) + delete _customSurface; + _customSurface = NULL; + } else { + create(w, h); + s.syncBytes((byte *)_customSurface->pixels, w * h); + } + } +} + /** * Fills a specified rectangle on the surface with the specified color * @@ -589,6 +626,9 @@ void GfxElement::setDefaults() { _fontNumber = _globals->_gfxFontNumber; _colors = _globals->_gfxColors; _fontColors = _globals->_fontColors; + _unkColor1 = _globals->_unkColor1; + _unkColor2 = _globals->_unkColor2; + _unkColor3 = _globals->_unkColor3; } /** @@ -602,7 +642,7 @@ void GfxElement::highlight() { // Scan through the contents of the element, switching any occurances of the foreground // color with the background color and vice versa Rect tempRect(_bounds); - tempRect.collapse(2, 2); + tempRect.collapse(_globals->_gfxEdgeAdjust - 1, _globals->_gfxEdgeAdjust - 1); for (int yp = tempRect.top; yp < tempRect.bottom; ++yp) { byte *lineP = (byte *)surface.getBasePtr(tempRect.left, yp); @@ -634,7 +674,7 @@ void GfxElement::drawFrame() { } Rect tempRect = _bounds; - tempRect.collapse(3, 3); + tempRect.collapse(_globals->_gfxEdgeAdjust, _globals->_gfxEdgeAdjust); tempRect.collapse(-1, -1); gfxManager.fillRect(tempRect, _colors.background); @@ -783,7 +823,10 @@ void GfxMessage::draw() { // Set the font and color gfxManager.setFillFlag(false); gfxManager._font.setFontNumber(_fontNumber); - gfxManager._font._colors.foreground = this->_colors.foreground; + + gfxManager._font._colors.foreground = this->_unkColor1; + gfxManager._font._colors2.background = this->_unkColor2; + gfxManager._font._colors2.foreground = this->_unkColor3; // Display the text gfxManager._font.writeLines(_message.c_str(), _bounds, _textAlign); @@ -803,8 +846,10 @@ void GfxButton::setDefaults() { gfxManager._font.getStringBounds(_message.c_str(), tempRect, 240); tempRect.right = ((tempRect.right + 15) / 16) * 16; - // Set the button bounds to a reduced area - tempRect.collapse(-3, -3); + // Set the button bounds + tempRect.collapse(-_globals->_gfxEdgeAdjust, -_globals->_gfxEdgeAdjust); + if (_vm->getFeatures() & GF_CD) + --tempRect.top; tempRect.moveTo(_bounds.left, _bounds.top); _bounds = tempRect; } @@ -820,11 +865,17 @@ void GfxButton::draw() { // Set the font and color gfxManager._font.setFontNumber(_fontNumber); - gfxManager._font._colors.foreground = this->_colors.foreground; + + // + gfxManager._font._colors.foreground = this->_unkColor1; + gfxManager._font._colors2.background = this->_unkColor2; + gfxManager._font._colors2.foreground = this->_unkColor3; // Display the button's text Rect tempRect(_bounds); - tempRect.collapse(3, 3); + tempRect.collapse(_globals->_gfxEdgeAdjust, _globals->_gfxEdgeAdjust); + if (_vm->getFeatures() & GF_CD) + ++tempRect.top; gfxManager._font.writeLines(_message.c_str(), tempRect, ALIGN_CENTER); gfxManager.unlockSurface(); @@ -885,7 +936,7 @@ void GfxDialog::setDefaults() { // Set the dialog boundaries _gfxManager._bounds = tempRect; - tempRect.collapse(-6, -6); + tempRect.collapse(-_globals->_gfxEdgeAdjust * 2, -_globals->_gfxEdgeAdjust * 2); _bounds = tempRect; } @@ -915,7 +966,7 @@ void GfxDialog::draw() { drawFrame(); // Reset the dialog's graphics manager to only draw within the dialog boundaries - tempRect.translate(6, 6); + tempRect.translate(_globals->_gfxEdgeAdjust * 2, _globals->_gfxEdgeAdjust * 2); _gfxManager._bounds = tempRect; // Draw each element in the dialog in order @@ -952,7 +1003,7 @@ void GfxDialog::addElements(GfxElement *ge, ...) { } void GfxDialog::setTopLeft(int xp, int yp) { - _bounds.moveTo(xp - 6, yp - 6); + _bounds.moveTo(xp - _globals->_gfxEdgeAdjust * 2, yp - _globals->_gfxEdgeAdjust * 2); } void GfxDialog::setCenter(int xp, int yp) { diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h index b269520039..e09e1093a3 100644 --- a/engines/tsage/graphics.h +++ b/engines/tsage/graphics.h @@ -91,6 +91,7 @@ public: void setScreenSurface(); Graphics::Surface lockSurface(); void unlockSurface(); + void synchronize(Serializer &s); void create(int width, int height); void setBounds(const Rect &bounds) { _bounds = bounds; } const Rect &getBounds() const { return _bounds; } @@ -176,6 +177,7 @@ public: uint16 _fontNumber; GfxColors _colors; GfxColors _fontColors; + byte _unkColor1, _unkColor2, _unkColor3; uint16 _keycode; public: GfxElement(); diff --git a/engines/tsage/ringworld_demo.cpp b/engines/tsage/ringworld_demo.cpp index 3ad414fa20..de8dbf8c12 100644 --- a/engines/tsage/ringworld_demo.cpp +++ b/engines/tsage/ringworld_demo.cpp @@ -40,17 +40,7 @@ Scene *RingworldDemoGame::createScene(int sceneNumber) { } void RingworldDemoGame::quitGame() { - _globals->_events.setCursor(CURSOR_ARROW); - MessageDialog *dlg = new MessageDialog(DEMO_EXIT_MSG, EXIT_BTN_STRING, DEMO_BTN_STRING); - dlg->draw(); - - GfxButton *selectedButton = dlg->execute(&dlg->_btn2); - bool exitFlag = selectedButton != &dlg->_btn2; - - delete dlg; - _globals->_events.hideCursor(); - - if (exitFlag) + if (MessageDialog::show(DEMO_EXIT_MSG, EXIT_BTN_STRING, DEMO_BTN_STRING) == 0) _vm->quitGame(); } diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp index 82f0153d8f..6960788db3 100644 --- a/engines/tsage/ringworld_scenes1.cpp +++ b/engines/tsage/ringworld_scenes1.cpp @@ -3102,6 +3102,18 @@ void Scene6100::Action7::signal() { /*--------------------------------------------------------------------------*/ +void Scene6100::Object::synchronize(Serializer &s) { + SceneObject::synchronize(s); + + // Save the double fields of the FloatSet + s.syncBytes((byte *)&_floats._float1, sizeof(double)); + s.syncBytes((byte *)&_floats._float2, sizeof(double)); + s.syncBytes((byte *)&_floats._float3, sizeof(double)); + s.syncBytes((byte *)&_floats._float4, sizeof(double)); +} + +/*--------------------------------------------------------------------------*/ + void Scene6100::ProbeMover::dispatch() { Scene6100 *scene = (Scene6100 *)_globals->_sceneManager._scene; @@ -3123,14 +3135,43 @@ void Scene6100::Item1::doAction(int action) { /*--------------------------------------------------------------------------*/ +Scene6100::Scene6100(): Scene() { + _objList[0] = &_sunflower1; + _objList[1] = &_sunflower2; + _objList[2] = &_sunflower3; + _objList[3] = &_rocks; + + _speed = 30; + _fadePercent = 100; + _rocksCheck = false; + _hitCount = 0; + _turnAmount = 0; + _angle = 0; + _msgActive = false; + + _globals->_sceneHandler._delayTicks = 8; + + _globals->_player.disableControl(); + _globals->_events.setCursor(CURSOR_WALK); +} + +void Scene6100::synchronize(Serializer &s) { + Scene::synchronize(s); + + s.syncAsSint16LE(_speed); + s.syncAsSint16LE(_fadePercent); + s.syncAsByte(_rocksCheck); + s.syncAsByte(_msgActive); + s.syncAsSint16LE(_hitCount); + s.syncAsSint16LE(_turnAmount); + s.syncAsSint16LE(_angle); +} + void Scene6100::postInit(SceneObjectList *OwnerList) { loadScene(6100); Scene::postInit(); setZoomPercents(62, 2, 200, 425); - _globals->_sceneHandler._delayTicks = 8; - _globals->_player.disableControl(); - _globals->_events.setCursor(CURSOR_WALK); _stripManager.addSpeaker(&_speakerQR); _stripManager.addSpeaker(&_speakerSL); @@ -3178,11 +3219,6 @@ void Scene6100::postInit(SceneObjectList *OwnerList) { _probe._floats._float3 = 0.0; _probe.hide(); - _objList[0] = &_sunflower1; - _objList[1] = &_sunflower2; - _objList[2] = &_sunflower3; - _objList[3] = &_rocks; - int baseVal = 2000; for (int idx = 0; idx < 3; ++idx) { _objList[idx]->_floats._float1 = _globals->_randomSource.getRandomNumber(999); @@ -3201,14 +3237,6 @@ void Scene6100::postInit(SceneObjectList *OwnerList) { _objList[idx]->changeZoom(-1); } - _speed = 30; - _fadePercent = 100; - _rocksCheck = false; - _hitCount = 0; - _turnAmount = 0; - _angle = 0; - _msgActive = false; - setAction(&_action5); _globals->_scenePalette.addRotation(96, 143, -1); diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h index 554b261f2c..abd765473c 100644 --- a/engines/tsage/ringworld_scenes1.h +++ b/engines/tsage/ringworld_scenes1.h @@ -483,6 +483,8 @@ class Scene6100 : public Scene { class Object : public SceneObject { public: FloatSet _floats; + + virtual void synchronize(Serializer &s); }; class ProbeMover : public NpcMover { public: @@ -519,6 +521,8 @@ public: Object *_objList[4]; bool _msgActive; + Scene6100(); + virtual void synchronize(Serializer &s); virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void remove(); virtual void process(Event &event); diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp index 56df32146a..522e40c236 100644 --- a/engines/tsage/saveload.cpp +++ b/engines/tsage/saveload.cpp @@ -206,7 +206,6 @@ Common::Error Saver::restore(int slot) { // Final post-restore notifications _macroRestoreFlag = false; _loadNotifiers.notify(false); - _globals->_events.setCursor(_globals->_player._uiEnabled ? CURSOR_WALK : CURSOR_NONE); return Common::kNoError; } diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index 51b7696590..c1c2851f28 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -33,7 +33,7 @@ namespace tSage { typedef void (*SaveNotifierFn)(bool postFlag); -#define TSAGE_SAVEGAME_VERSION 3 +#define TSAGE_SAVEGAME_VERSION 5 class SavedObject; diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h index 563fdfcc21..5db45f24ab 100644 --- a/engines/tsage/tsage.h +++ b/engines/tsage/tsage.h @@ -23,7 +23,6 @@ #ifndef TSAGE_H #define TSAGE_H -#include "engines/advancedDetector.h" #include "engines/engine.h" #include "common/rect.h" #include "audio/mixer.h" diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 31d9caef73..3eb3973371 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -102,31 +102,6 @@ static const ADGameDescription tuckerGameDescriptions[] = { AD_TABLE_END_MARKER }; -static const ADParams detectionParams = { - // Pointer to ADGameDescription or its superset structure - (const byte *)tuckerGameDescriptions, - // Size of that superset structure - sizeof(ADGameDescription), - // Number of bytes to compute MD5 sum for - 512, - // List of all engine targets - tuckerGames, - // Structure for autoupgrading obsolete targets - 0, - // Name of single gameid (optional) - "tucker", - // List of files for file-based fallback detection (optional) - 0, - // Flags - 0, - // Additional GUI options (for every game) - Common::GUIO_NONE, - // Maximum directory depth - 1, - // List of directory globs - 0 -}; - static const ADGameDescription tuckerDemoGameDescription = { "tucker", "Non-Interactive Demo", @@ -139,7 +114,9 @@ static const ADGameDescription tuckerDemoGameDescription = { class TuckerMetaEngine : public AdvancedMetaEngine { public: - TuckerMetaEngine() : AdvancedMetaEngine(detectionParams) { + TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { + params.md5Bytes = 512; + params.singleid = "tucker"; } virtual const char *getName() const { diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp index 297b583d54..a5498903e2 100644 --- a/graphics/cursorman.cpp +++ b/graphics/cursorman.cpp @@ -86,7 +86,7 @@ void CursorManager::popAllCursors() { delete cur; } - if (g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) { + if (g_system->hasFeature(OSystem::kFeatureCursorPalette)) { while (!_cursorPaletteStack.empty()) { Palette *pal = _cursorPaletteStack.pop(); delete pal; @@ -141,11 +141,11 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, } bool CursorManager::supportsCursorPalettes() { - return g_system->hasFeature(OSystem::kFeatureCursorHasPalette); + return g_system->hasFeature(OSystem::kFeatureCursorPalette); } void CursorManager::disableCursorPalette(bool disable) { - if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) + if (!g_system->hasFeature(OSystem::kFeatureCursorPalette)) return; if (_cursorPaletteStack.empty()) @@ -154,11 +154,11 @@ void CursorManager::disableCursorPalette(bool disable) { Palette *pal = _cursorPaletteStack.top(); pal->_disabled = disable; - g_system->disableCursorPalette(disable); + g_system->setFeatureState(OSystem::kFeatureCursorPalette, !disable); } void CursorManager::pushCursorPalette(const byte *colors, uint start, uint num) { - if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) + if (!g_system->hasFeature(OSystem::kFeatureCursorPalette)) return; Palette *pal = new Palette(colors, start, num); @@ -167,11 +167,11 @@ void CursorManager::pushCursorPalette(const byte *colors, uint start, uint num) if (num) g_system->setCursorPalette(colors, start, num); else - g_system->disableCursorPalette(true); + g_system->setFeatureState(OSystem::kFeatureCursorPalette, false); } void CursorManager::popCursorPalette() { - if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) + if (!g_system->hasFeature(OSystem::kFeatureCursorPalette)) return; if (_cursorPaletteStack.empty()) @@ -181,7 +181,7 @@ void CursorManager::popCursorPalette() { delete pal; if (_cursorPaletteStack.empty()) { - g_system->disableCursorPalette(true); + g_system->setFeatureState(OSystem::kFeatureCursorPalette, false); return; } @@ -190,11 +190,11 @@ void CursorManager::popCursorPalette() { if (pal->_num && !pal->_disabled) g_system->setCursorPalette(pal->_data, pal->_start, pal->_num); else - g_system->disableCursorPalette(true); + g_system->setFeatureState(OSystem::kFeatureCursorPalette, false); } void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint num) { - if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) + if (!g_system->hasFeature(OSystem::kFeatureCursorPalette)) return; if (_cursorPaletteStack.empty()) { @@ -219,7 +219,7 @@ void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint nu memcpy(pal->_data, colors, size); g_system->setCursorPalette(pal->_data, pal->_start, pal->_num); } else { - g_system->disableCursorPalette(true); + g_system->setFeatureState(OSystem::kFeatureCursorPalette, false); } } diff --git a/graphics/cursorman.h b/graphics/cursorman.h index 1e7ce83611..543a5d0a5c 100644 --- a/graphics/cursorman.h +++ b/graphics/cursorman.h @@ -108,9 +108,9 @@ public: * Test whether cursor palettes are supported. * * This is just an convenience wrapper for checking for - * OSystem::kFeatureCursorHasPalette to be supported by OSystem. + * OSystem::kFeatureCursorPalette to be supported by OSystem. * - * @see OSystem::kFeatureCursorHasPalette + * @see OSystem::kFeatureCursorPalette * @see OSystem::hasFeature */ bool supportsCursorPalettes(); diff --git a/graphics/font.h b/graphics/font.h index 7a992674d2..dc75f86e1f 100644 --- a/graphics/font.h +++ b/graphics/font.h @@ -114,18 +114,6 @@ public: int wordWrapText(const Common::String &str, int maxWidth, Common::Array<Common::String> &lines) const; }; -/** - * A SCUMM style font. - */ -class ScummFont : public Font { -public: - virtual int getFontHeight() const { return 8; } - virtual int getMaxCharWidth() const { return 8; } - - virtual int getCharWidth(byte chr) const; - virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const; -}; - typedef uint16 bitmap_t; /* bitmap image unit size*/ struct BBX { diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp index f937e55b69..f40cf97602 100644 --- a/graphics/fontman.cpp +++ b/graphics/fontman.cpp @@ -21,12 +21,12 @@ #include "graphics/font.h" #include "graphics/fontman.h" +#include "common/translation.h" DECLARE_SINGLETON(Graphics::FontManager); namespace Graphics { -const ScummFont *g_scummfont = 0; FORWARD_DECLARE_FONT(g_sysfont); FORWARD_DECLARE_FONT(g_sysfont_big); FORWARD_DECLARE_FONT(g_consolefont); @@ -34,18 +34,15 @@ FORWARD_DECLARE_FONT(g_consolefont); FontManager::FontManager() { // This assert should *never* trigger, because // FontManager is a singleton, thus there is only - // one instance of it per time. (g_scummfont gets + // one instance of it per time. (g_sysfont gets // reset to 0 in the desctructor of this class). - assert(g_scummfont == 0); - g_scummfont = new ScummFont; + assert(g_sysfont == 0); INIT_FONT(g_sysfont); INIT_FONT(g_sysfont_big); INIT_FONT(g_consolefont); } FontManager::~FontManager() { - delete g_scummfont; - g_scummfont = 0; delete g_sysfont; g_sysfont = 0; delete g_sysfont_big; @@ -58,7 +55,6 @@ const struct { const char *name; FontManager::FontUsage id; } builtinFontNames[] = { - { "builtinOSD", FontManager::kOSDFont }, { "builtinConsole", FontManager::kConsoleFont }, { "fixed5x8.bdf", FontManager::kConsoleFont }, { "fixed5x8-iso-8859-1.bdf", FontManager::kConsoleFont }, @@ -69,32 +65,112 @@ const struct { { "helvB12.bdf", FontManager::kBigGUIFont }, { "helvB12-iso-8859-1.bdf", FontManager::kBigGUIFont }, { "helvB12-ascii.bdf", FontManager::kBigGUIFont }, - { 0, FontManager::kOSDFont } + { 0, FontManager::kConsoleFont } }; +bool FontManager::assignFontToName(const Common::String &name, const Font *font) { + Common::String lowercaseName = name; + lowercaseName.toLowercase(); + _fontMap[lowercaseName] = font; + return true; +} + +void FontManager::removeFontName(const Common::String &name) { + Common::String lowercaseName = name; + lowercaseName.toLowercase(); + _fontMap.erase(lowercaseName); +} + const Font *FontManager::getFontByName(const Common::String &name) const { for (int i = 0; builtinFontNames[i].name; i++) if (!scumm_stricmp(name.c_str(), builtinFontNames[i].name)) return getFontByUsage(builtinFontNames[i].id); - if (!_fontMap.contains(name)) + Common::String lowercaseName = name; + lowercaseName.toLowercase(); + if (!_fontMap.contains(lowercaseName)) return 0; - return _fontMap[name]; + return _fontMap[lowercaseName]; } const Font *FontManager::getFontByUsage(FontUsage usage) const { switch (usage) { - case kOSDFont: - return g_scummfont; case kConsoleFont: return g_consolefont; case kGUIFont: return g_sysfont; case kBigGUIFont: return g_sysfont_big; + case kLocalizedFont: + { + // First try to find a kBigGUIFont + Common::String fontName = getLocalizedFontNameByUsage(kBigGUIFont); + if (!fontName.empty()) { + const Font *font = getFontByName(fontName); + if (font) + return font; + } + // Try kGUIFont + fontName = getLocalizedFontNameByUsage(kGUIFont); + if (!fontName.empty()) { + const Font *font = getFontByName(fontName); + if (font) + return font; + } +#ifdef USE_TRANSLATION + // Accept any other font that has the charset in its name + for (Common::HashMap<Common::String, const Font *>::const_iterator it = _fontMap.begin() ; it != _fontMap.end() ; ++it) { + if (it->_key.contains(TransMan.getCurrentCharset())) + return it->_value; + } +#endif + // Fallback: return a non localized kGUIFont. + // Maybe we should return a null pointer instead? + return g_sysfont; + } } return 0; } +Common::String FontManager::getLocalizedFontNameByUsage(FontUsage usage) const { + // We look for a name that matches the usage and that ends in .bdf. + // It should also not contain "-ascii" or "-iso-" in its name. + // We take the first name that matches. + for (int i = 0; builtinFontNames[i].name; i++) { + if (builtinFontNames[i].id == usage) { + Common::String fontName(builtinFontNames[i].name); + if (!fontName.contains("-ascii") && !fontName.contains("-iso-") && fontName.contains(".bdf")) + return genLocalizedFontFilename(fontName); + } + } + return Common::String(); +} + +Common::String FontManager::genLocalizedFontFilename(const Common::String &filename) const { +#ifndef USE_TRANSLATION + return filename; +#else + // We will transform the font filename in the following way: + // name.bdf + // will become: + // name-charset.bdf + // Note that name should not contain any dot here! + + // In the first step we look for the dot. In case there is none we will + // return the normal filename. + Common::String::const_iterator dot = Common::find(filename.begin(), filename.end(), '.'); + if (dot == filename.end()) + return filename; + + // Put the translated font filename string back together. + Common::String result(filename.begin(), dot); + result += '-'; + result += TransMan.getCurrentCharset(); + result += dot; + + return result; +#endif +} + } // End of namespace Graphics diff --git a/graphics/fontman.h b/graphics/fontman.h index d3b84ffa7c..858a733d45 100644 --- a/graphics/fontman.h +++ b/graphics/fontman.h @@ -36,7 +36,7 @@ class Font; class FontManager : public Common::Singleton<FontManager> { public: enum FontUsage { - kOSDFont = 0, + kLocalizedFont = 0, kConsoleFont = 1, kGUIFont = 2, kBigGUIFont = 3 @@ -57,14 +57,14 @@ public: * @param font the font object * @return true on success, false on failure */ - bool assignFontToName(const Common::String &name, const Font *font) { _fontMap[name] = font; return true; } + bool assignFontToName(const Common::String &name, const Font *font); /** * Removes binding from name to font * * @param name name which should be removed */ - void removeFontName(const Common::String &name) { _fontMap.erase(name); } + void removeFontName(const Common::String &name); /** * Retrieve a font object based on what it is supposed @@ -75,8 +75,26 @@ public: */ const Font *getFontByUsage(FontUsage usage) const; + /** + * Get the localized font for the current TranslationManager charset from the + * non localized font name + * + * @param filename the non-localized font file name. + * @return The localized font file name. + */ + Common::String genLocalizedFontFilename(const Common::String &filename) const; + //const Font *getFontBySize(int size???) const; +protected: + /** + * Get the name of the localized font for the given usage. There is no garanty that + * the font exists. If the usage is kLocalizedFont it returns an empty string. + * + * @param usage a FontUsage enum value indicating what the font will be used for. + * @return the name of a localized font or an empty string if no suitable font was found. + */ + Common::String getLocalizedFontNameByUsage(FontUsage usage) const; private: friend class Common::Singleton<SingletonBaseType>; diff --git a/graphics/fonts/scummfont.cpp b/graphics/fonts/scummfont.cpp deleted file mode 100644 index 1ff1e51fdc..0000000000 --- a/graphics/fonts/scummfont.cpp +++ /dev/null @@ -1,313 +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 "graphics/font.h" -#include "graphics/surface.h" - -namespace Graphics { - -// Built-in font -static const byte guifont[] = { - // Header - 0, 0, 99, 1, 226, 8, - // Character width table - 4, 8, 6, 8, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 2, 1, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 3, 7, 8, 7, 7, 8, 4, 5, 5, 8, 7, 4, 7, 3, 8, - 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 3, 4, 7, 5, 7, 7, - 8, 7, 7, 7, 7, 7, 7, 7, 7, 5, 7, 7, 7, 8, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 5, 8, 5, 8, 8, - 7, 7, 7, 6, 7, 7, 7, 7, 7, 5, 6, 7, 5, 8, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 5, 3, 5, 7, 8, - 7, 7, 7, 7, 7, 7, 0, 6, 7, 7, 7, 5, 5, 5, 7, 0, - 6, 8, 8, 7, 7, 7, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0, - 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 7, - // Character table - 0, 0, 0, 0, 0, 0, 0, 0, // 0 - 1, 3, 6, 12, 24, 62, 3, 0, // 1 - 128, 192, 96, 48, 24, 124, 192, 0, // 2 - 0, 3, 62, 24, 12, 6, 3, 1, // 3 - 0, 192, 124, 24, 48, 96, 192, 128, // 4 - 0, 0, 0, 0, 0, 0, 0, 0, // 5 - 0, 0, 0, 0, 0, 0, 0, 0, // 6 - 0, 0, 0, 0, 0, 0, 0, 0, // 7 - 0, 0, 0, 0, 0, 0, 0, 0, // 8 - 0, 0, 0, 0, 0, 0, 0, 0, // 9 - 0, 0, 0, 0, 0, 0, 0, 0, // 10 - 0, 0, 0, 0, 0, 0, 0, 0, // 11 - 0, 0, 0, 0, 0, 0, 0, 0, // 12 - 0, 0, 0, 0, 0, 0, 0, 0, // 13 - 0, 0, 0, 0, 0, 0, 0, 0, // 14 - 0, 0, 0, 0, 0, 0, 0, 0, // 15 - 237, 74, 72, 0, 0, 0, 0, 0, // 16 - 128, 128, 128, 0, 0, 0, 0, 0, // 17 - 0, 0, 0, 0, 0, 0, 0, 0, // 18 - 60, 66, 153, 161, 161, 153, 66, 60, // 19 - 0, 0, 0, 0, 0, 0, 0, 0, // 20 - 0, 0, 0, 0, 0, 0, 0, 0, // 21 - 0, 0, 0, 0, 0, 0, 0, 0, // 22 - 0, 0, 0, 0, 0, 0, 0, 0, // 23 - 0, 0, 0, 0, 0, 0, 0, 0, // 24 - 0, 0, 0, 0, 0, 0, 0, 0, // 25 - 0, 0, 0, 0, 0, 0, 0, 0, // 26 - 0, 0, 0, 0, 0, 0, 0, 0, // 27 - 0, 0, 0, 0, 0, 0, 0, 0, // 28 - 0, 0, 0, 0, 0, 0, 0, 0, // 29 - 0, 0, 0, 0, 0, 0, 0, 0, // 30 - 0, 0, 0, 0, 0, 0, 0, 0, // 31 - 0, 0, 0, 0, 0, 0, 0, 0, // 32 - 96, 96, 96, 96, 0, 0, 96, 0, // 33 - 102, 102, 102, 0, 0, 0, 0, 0, // 34 - 102, 102, 255, 102, 255, 102, 102, 0, // 35 - 24, 62, 96, 60, 6, 124, 24, 0, // 36 - 98, 102, 12, 24, 48, 102, 70, 0, // 37 - 60, 102, 60, 56, 103, 102, 63, 0, // 38 - 96, 48, 16, 0, 0, 0, 0, 0, // 39 - 24, 48, 96, 96, 96, 48, 24, 0, // 40 - 96, 48, 24, 24, 24, 48, 96, 0, // 41 - 0, 102, 60, 255, 60, 102, 0, 0, // 42 - 0, 24, 24, 126, 24, 24, 0, 0, // 43 - 0, 0, 0, 0, 0, 48, 48, 96, // 44 - 0, 0, 0, 126, 0, 0, 0, 0, // 45 - 0, 0, 0, 0, 0, 96, 96, 0, // 46 - 0, 3, 6, 12, 24, 48, 96, 0, // 47 - 60, 102, 102, 102, 102, 102, 60, 0, // 48 - 24, 24, 56, 24, 24, 24, 126, 0, // 49 - 60, 102, 6, 12, 48, 96, 126, 0, // 50 - 60, 102, 6, 28, 6, 102, 60, 0, // 51 - 6, 14, 30, 102, 127, 6, 6, 0, // 52 - 126, 96, 124, 6, 6, 102, 60, 0, // 53 - 60, 102, 96, 124, 102, 102, 60, 0, // 54 - 126, 102, 12, 24, 24, 24, 24, 0, // 55 - 60, 102, 102, 60, 102, 102, 60, 0, // 56 - 60, 102, 102, 62, 6, 102, 60, 0, // 57 - 0, 0, 96, 0, 0, 96, 0, 0, // 58 - 0, 0, 48, 0, 0, 48, 48, 96, // 59 - 14, 24, 48, 96, 48, 24, 14, 0, // 60 - 0, 0, 120, 0, 120, 0, 0, 0, // 61 - 112, 24, 12, 6, 12, 24, 112, 0, // 62 - 60, 102, 6, 12, 24, 0, 24, 0, // 63 - 0, 0, 0, 255, 255, 0, 0, 0, // 64 - 24, 60, 102, 126, 102, 102, 102, 0, // 65 - 124, 102, 102, 124, 102, 102, 124, 0, // 66 - 60, 102, 96, 96, 96, 102, 60, 0, // 67 - 120, 108, 102, 102, 102, 108, 120, 0, // 68 - 126, 96, 96, 120, 96, 96, 126, 0, // 69 - 126, 96, 96, 120, 96, 96, 96, 0, // 70 - 60, 102, 96, 110, 102, 102, 60, 0, // 71 - 102, 102, 102, 126, 102, 102, 102, 0, // 72 - 120, 48, 48, 48, 48, 48, 120, 0, // 73 - 30, 12, 12, 12, 12, 108, 56, 0, // 74 - 102, 108, 120, 112, 120, 108, 102, 0, // 75 - 96, 96, 96, 96, 96, 96, 126, 0, // 76 - 99, 119, 127, 107, 99, 99, 99, 0, // 77 - 102, 118, 126, 126, 110, 102, 102, 0, // 78 - 60, 102, 102, 102, 102, 102, 60, 0, // 79 - 124, 102, 102, 124, 96, 96, 96, 0, // 80 - 60, 102, 102, 102, 102, 60, 14, 0, // 81 - 124, 102, 102, 124, 120, 108, 102, 0, // 82 - 60, 102, 96, 60, 6, 102, 60, 0, // 83 - 126, 24, 24, 24, 24, 24, 24, 0, // 84 - 102, 102, 102, 102, 102, 102, 60, 0, // 85 - 102, 102, 102, 102, 102, 60, 24, 0, // 86 - 99, 99, 99, 107, 127, 119, 99, 0, // 87 - 102, 102, 60, 24, 60, 102, 102, 0, // 88 - 102, 102, 102, 60, 24, 24, 24, 0, // 89 - 126, 6, 12, 24, 48, 96, 126, 0, // 90 - 120, 96, 96, 96, 96, 96, 120, 0, // 91 - 3, 6, 12, 24, 48, 96, 192, 0, // 92 - 120, 24, 24, 24, 24, 24, 120, 0, // 93 - 0, 0, 0, 0, 0, 219, 219, 0, // 94 - 0, 0, 0, 0, 0, 0, 0, 255, // 95 - 102, 102, 102, 0, 0, 0, 0, 0, // 96 - 0, 0, 60, 6, 62, 102, 62, 0, // 97 - 0, 96, 96, 124, 102, 102, 124, 0, // 98 - 0, 0, 60, 96, 96, 96, 60, 0, // 99 - 0, 6, 6, 62, 102, 102, 62, 0, // 100 - 0, 0, 60, 102, 126, 96, 60, 0, // 101 - 0, 14, 24, 62, 24, 24, 24, 0, // 102 - 0, 0, 62, 102, 102, 62, 6, 124, // 103 - 0, 96, 96, 124, 102, 102, 102, 0, // 104 - 0, 48, 0, 112, 48, 48, 120, 0, // 105 - 0, 12, 0, 12, 12, 12, 12, 120, // 106 - 0, 96, 96, 108, 120, 108, 102, 0, // 107 - 0, 112, 48, 48, 48, 48, 120, 0, // 108 - 0, 0, 102, 127, 127, 107, 99, 0, // 109 - 0, 0, 124, 102, 102, 102, 102, 0, // 110 - 0, 0, 60, 102, 102, 102, 60, 0, // 111 - 0, 0, 124, 102, 102, 124, 96, 96, // 112 - 0, 0, 62, 102, 102, 62, 6, 6, // 113 - 0, 0, 124, 102, 96, 96, 96, 0, // 114 - 0, 0, 62, 96, 60, 6, 124, 0, // 115 - 0, 24, 126, 24, 24, 24, 14, 0, // 116 - 0, 0, 102, 102, 102, 102, 62, 0, // 117 - 0, 0, 102, 102, 102, 60, 24, 0, // 118 - 0, 0, 99, 107, 127, 62, 54, 0, // 119 - 0, 0, 102, 60, 24, 60, 102, 0, // 120 - 0, 0, 102, 102, 102, 62, 12, 120, // 121 - 0, 0, 126, 12, 24, 48, 126, 0, // 122 - 24, 48, 48, 96, 48, 48, 24, 0, // 123 - 96, 96, 96, 0, 96, 96, 96, 0, // 124 - 96, 48, 48, 24, 48, 48, 96, 0, // 125 - 0, 0, 97, 153, 134, 0, 0, 0, // 126 - 8, 12, 14, 255, 255, 14, 12, 8, // 127 - 60, 102, 96, 96, 102, 60, 24, 56, // 128 - 102, 0, 102, 102, 102, 102, 62, 0, // 129 - 12, 24, 60, 102, 126, 96, 60, 0, // 130 - 24, 36, 60, 6, 62, 102, 62, 0, // 131 - 102, 0, 60, 6, 62, 102, 62, 0, // 132 - 48, 24, 60, 6, 62, 102, 62, 0, // 133 - 0, 0, 0, 0, 0, 0, 0, 0, // 134 - 0, 60, 96, 96, 96, 60, 24, 56, // 135 - 24, 36, 60, 102, 126, 96, 60, 0, // 136 - 102, 0, 60, 102, 126, 96, 60, 0, // 137 - 48, 24, 60, 102, 126, 96, 60, 0, // 138 - 0, 216, 0, 112, 48, 48, 120, 0, // 139 - 48, 72, 0, 112, 48, 48, 120, 0, // 140 - 96, 48, 0, 112, 48, 48, 120, 0, // 141 - 102, 24, 60, 102, 126, 102, 102, 0, // 142 - 0, 0, 0, 0, 0, 0, 0, 0, // 143 - 24, 48, 124, 96, 120, 96, 124, 0, // 144 - 0, 0, 108, 26, 126, 216, 110, 0, // 145 - 30, 40, 40, 126, 72, 136, 142, 0, // 146 - 24, 36, 60, 102, 102, 102, 60, 0, // 147 - 102, 0, 60, 102, 102, 102, 60, 0, // 148 - 48, 24, 60, 102, 102, 102, 60, 0, // 149 - 24, 36, 0, 102, 102, 102, 62, 0, // 150 - 48, 24, 102, 102, 102, 102, 62, 0, // 151 - 0, 0, 0, 0, 0, 0, 0, 0, // 152 - 102, 60, 102, 102, 102, 102, 60, 0, // 153 - 102, 0, 102, 102, 102, 102, 60, 0, // 154 - 0, 0, 0, 0, 0, 0, 0, 0, // 155 - 0, 0, 0, 0, 0, 0, 0, 0, // 156 - 0, 0, 0, 0, 0, 0, 0, 0, // 157 - 0, 0, 0, 0, 0, 0, 0, 0, // 158 - 0, 0, 0, 0, 0, 0, 0, 0, // 159 - 12, 24, 60, 6, 62, 102, 62, 0, // 160 - 0, 0, 0, 0, 0, 0, 0, 0, // 161 - 0, 0, 0, 0, 0, 0, 0, 0, // 162 - 0, 0, 0, 0, 0, 0, 0, 0, // 163 - 0, 0, 0, 0, 0, 0, 0, 0, // 164 - 0, 0, 0, 0, 0, 0, 0, 0, // 165 - 0, 0, 0, 0, 0, 0, 0, 0, // 166 - 0, 0, 0, 0, 0, 0, 0, 0, // 167 - 0, 0, 0, 0, 0, 0, 0, 0, // 168 - 0, 0, 0, 0, 0, 0, 0, 0, // 169 - 0, 0, 0, 0, 0, 0, 0, 0, // 170 - 0, 0, 0, 0, 0, 0, 0, 0, // 171 - 0, 0, 0, 0, 0, 0, 0, 0, // 172 - 0, 0, 0, 0, 0, 0, 0, 0, // 173 - 0, 0, 0, 0, 0, 0, 0, 0, // 174 - 0, 0, 0, 0, 0, 0, 0, 0, // 175 - 0, 0, 0, 0, 0, 0, 0, 0, // 176 - 0, 0, 0, 0, 0, 0, 0, 0, // 177 - 0, 0, 0, 0, 0, 0, 0, 0, // 178 - 0, 0, 0, 0, 0, 0, 0, 0, // 179 - 0, 0, 0, 0, 0, 0, 0, 0, // 180 - 0, 0, 0, 0, 0, 0, 0, 0, // 181 - 0, 0, 0, 0, 0, 0, 0, 0, // 182 - 0, 0, 0, 0, 0, 0, 0, 0, // 183 - 0, 0, 0, 0, 0, 0, 0, 0, // 184 - 0, 0, 0, 0, 0, 0, 0, 0, // 185 - 0, 0, 0, 0, 0, 0, 0, 0, // 186 - 0, 0, 0, 0, 0, 0, 0, 0, // 187 - 0, 0, 0, 0, 0, 0, 0, 0, // 188 - 0, 0, 0, 0, 0, 0, 0, 0, // 189 - 0, 0, 0, 0, 0, 0, 0, 0, // 190 - 0, 0, 0, 0, 0, 0, 0, 0, // 191 - 0, 0, 0, 0, 0, 0, 0, 0, // 192 - 0, 0, 0, 0, 0, 0, 0, 0, // 193 - 0, 0, 0, 0, 0, 0, 0, 0, // 194 - 0, 0, 0, 0, 0, 0, 0, 0, // 195 - 0, 0, 0, 0, 0, 0, 0, 0, // 196 - 0, 0, 0, 0, 0, 0, 0, 0, // 197 - 0, 0, 0, 0, 0, 0, 0, 0, // 198 - 0, 0, 0, 0, 0, 0, 0, 0, // 199 - 0, 0, 0, 0, 0, 0, 0, 0, // 200 - 0, 0, 0, 0, 0, 0, 0, 0, // 201 - 0, 0, 0, 0, 0, 0, 0, 0, // 202 - 0, 0, 0, 0, 0, 0, 0, 0, // 203 - 0, 0, 0, 0, 0, 0, 0, 0, // 204 - 0, 0, 0, 0, 0, 0, 0, 0, // 205 - 0, 0, 0, 0, 0, 0, 0, 0, // 206 - 0, 0, 0, 0, 0, 0, 0, 0, // 207 - 0, 0, 0, 0, 0, 0, 0, 0, // 208 - 0, 0, 0, 0, 0, 0, 0, 0, // 209 - 0, 0, 0, 0, 0, 0, 0, 0, // 210 - 0, 0, 0, 0, 0, 0, 0, 0, // 211 - 0, 0, 0, 0, 0, 0, 0, 0, // 212 - 0, 0, 0, 0, 0, 0, 0, 0, // 213 - 0, 0, 0, 0, 0, 0, 0, 0, // 214 - 0, 0, 0, 0, 0, 0, 0, 0, // 215 - 0, 0, 0, 0, 0, 0, 0, 0, // 216 - 0, 0, 0, 0, 0, 0, 0, 0, // 217 - 0, 0, 0, 0, 0, 0, 0, 0, // 218 - 0, 0, 0, 0, 0, 0, 0, 0, // 219 - 0, 0, 0, 0, 0, 0, 0, 0, // 220 - 0, 0, 0, 0, 0, 0, 0, 0, // 221 - 0, 0, 0, 0, 0, 0, 0, 0, // 222 - 0, 0, 0, 0, 0, 0, 0, 0, // 223 - 0, 0, 0, 0, 0, 0, 0, 0, // 224 - 28, 54, 54, 124, 102, 102, 124, 64, // 225 - 0, 0, 0 // ??? -}; - -int ScummFont::getCharWidth(byte chr) const { - return guifont[chr+6]; -} - -void ScummFont::drawChar(Surface *dst, byte chr, int tx, int ty, uint32 color) const { - assert(dst != 0); - byte *ptr = (byte *)dst->getBasePtr(tx, ty); - - const byte *tmp = guifont + 6 + guifont[4] + chr * 8; - uint buffer = 0; - uint mask = 0; - - for (int y = 0; y < 8; y++) { - if (ty + y < 0 || ty + y >= dst->h) - continue; - for (int x = 0; x < 8; x++) { - if (tx + x < 0 || tx + x >= dst->w) - continue; - unsigned char c; - mask >>= 1; - if (mask == 0) { - buffer = *tmp++; - mask = 0x80; - } - c = ((buffer & mask) != 0); - if (c) { - if (dst->format.bytesPerPixel == 1) - ptr[x] = color; - else if (dst->format.bytesPerPixel == 2) - ((uint16 *)ptr)[x] = color; - } - } - ptr += dst->pitch; - } -} - -} // End of namespace Graphics diff --git a/graphics/module.mk b/graphics/module.mk index a9051c868a..32658c96bd 100644 --- a/graphics/module.mk +++ b/graphics/module.mk @@ -9,7 +9,6 @@ MODULE_OBJS := \ fonts/consolefont.o \ fonts/newfont_big.o \ fonts/newfont.o \ - fonts/scummfont.o \ fonts/winfont.o \ iff.o \ imagedec.o \ diff --git a/graphics/scaler/Normal2xARM.s b/graphics/scaler/Normal2xARM.s index 9afe3f34f0..e3592295e0 100644 --- a/graphics/scaler/Normal2xARM.s +++ b/graphics/scaler/Normal2xARM.s @@ -44,6 +44,7 @@ Normal2xARM: ADD r3, r3, r6 yloop: SUBS r14,r4, #4 + ADDLT r14,r14, #4 BLT thin xloop: LDRH r6, [r0], #2 diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp index 64a1cd1534..943395aff3 100644 --- a/graphics/scaler/aspect.cpp +++ b/graphics/scaler/aspect.cpp @@ -57,19 +57,6 @@ static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint1 template<typename ColorMask, int scale> static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int width) { - // For efficiency reasons we blit two pixels at a time, so it is important - // that makeRectStretchable() guarantees that the width is even and that - // the rect starts on a well-aligned address. (Even where unaligned memory - // access is allowed there may be a speed penalty for it.) - - // These asserts are disabled for maximal speed; but I leave them in here - // in case other people want to test if the memory alignment (to an - // address divisible by 4) is really working properly. - //assert(((int)dst & 3) == 0); - //assert(((int)srcA & 3) == 0); - //assert(((int)srcB & 3) == 0); - //assert((width & 1) == 0); - if (scale == 1) { while (width--) { *dst++ = interpolate16_7_1<ColorMask>(*srcB++, *srcA++); @@ -86,6 +73,18 @@ static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint1 template<typename ColorMask, int scale> static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int width) { + // For efficiency reasons we blit two pixels at a time, so it is important + // that makeRectStretchable() guarantees that the width is even and that + // the rect starts on a well-aligned address. (Even where unaligned memory + // access is allowed there may be a speed penalty for it.) + + // These asserts are disabled for maximal speed; but I leave them in here + // in case other people want to test if the memory alignment (to an + // address divisible by 4) is really working properly. + //assert(((int)dst & 3) == 0); + //assert(((int)srcA & 3) == 0); + //assert(((int)srcB & 3) == 0); + //assert((width & 1) == 0); width /= 2; const uint32 *sA = (const uint32 *)srcA; diff --git a/graphics/scaler/downscaler.cpp b/graphics/scaler/downscaler.cpp index fa17490475..65400ccd46 100644 --- a/graphics/scaler/downscaler.cpp +++ b/graphics/scaler/downscaler.cpp @@ -22,7 +22,7 @@ #include "graphics/scaler/downscaler.h" #include "graphics/scaler/intern.h" -#ifdef ARM +#ifdef USE_ARM_SCALER_ASM extern "C" { void DownscaleAllByHalfARM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height, int mask, int round); } diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 678b5f0ea4..73c1835c9e 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -561,7 +561,7 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) { if (file == "default") { _texts[textId]->_fontPtr = _font; } else { - Common::String localized = genLocalizedFontFilename(file); + Common::String localized = FontMan.genLocalizedFontFilename(file); // Try built-in fonts _texts[textId]->_fontPtr = FontMan.getFontByName(localized); @@ -1271,7 +1271,7 @@ void ThemeEngine::openDialog(bool doBuffer, ShadingStyle style) { } bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale) { - if (!_system->hasFeature(OSystem::kFeatureCursorHasPalette)) + if (!_system->hasFeature(OSystem::kFeatureCursorPalette)) return true; // Try to locate the specified file among all loaded bitmaps @@ -1468,32 +1468,6 @@ Common::String ThemeEngine::genCacheFilename(const Common::String &filename) con return Common::String(); } -Common::String ThemeEngine::genLocalizedFontFilename(const Common::String &filename) const { -#ifndef USE_TRANSLATION - return filename; -#else - // We will transform the font filename in the following way: - // name.bdf - // will become: - // name-charset.bdf - // Note that name should not contain any dot here! - - // In the first step we look for the dot. In case there is none we will - // return the normal filename. - Common::String::const_iterator dot = Common::find(filename.begin(), filename.end(), '.'); - if (dot == filename.end()) - return filename; - - // Put the translated font filename string back together. - Common::String result(filename.begin(), dot); - result += '-'; - result += TransMan.getCurrentCharset(); - result += dot; - - return result; -#endif -} - /********************************************************** * Static Theme XML functions diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index cc446ac6b0..5fbea7e301 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -539,7 +539,6 @@ protected: const Graphics::Font *loadFontFromArchive(const Common::String &filename); const Graphics::Font *loadCachedFontFromArchive(const Common::String &filename); Common::String genCacheFilename(const Common::String &filename) const; - Common::String genLocalizedFontFilename(const Common::String &filename) const; /** * Actual Dirty Screen handling function. diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index 56ee6df5cc..5b1faa4075 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -232,7 +232,7 @@ bool ThemeParser::parserCallback_bitmap(ParserNode *node) { } if (!_theme->addBitmap(node->values["filename"])) - return parserError("Error loading Bitmap file '%s'", node->values["filename"].c_str()); + return parserError("Error loading Bitmap file '" + node->values["filename"] + "'"); return true; } @@ -252,7 +252,7 @@ bool ThemeParser::parserCallback_text(ParserNode *node) { TextColor textColorId = parseTextColorId(node->values["text_color"]); if (!_theme->addTextData(id, textDataId, textColorId, alignH, alignV)) - return parserError("Error adding Text Data for '%s'.", id.c_str()); + return parserError("Error adding Text Data for '" + id + "'."); return true; } @@ -279,13 +279,13 @@ bool ThemeParser::parserCallback_color(ParserNode *node) { Common::String name = node->values["name"]; if (_palette.contains(name)) - return parserError("Color '%s' has already been defined.", name.c_str()); + return parserError("Color '" + name + "' has already been defined."); int red, green, blue; if (parseIntegerKey(node->values["rgb"], 3, &red, &green, &blue) == false || red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255) - return parserError("Error parsing RGB values for palette color '%s'", name.c_str());\ + return parserError("Error parsing RGB values for palette color '" + name + "'"); _palette[name].r = red; _palette[name].g = green; @@ -332,7 +332,7 @@ bool ThemeParser::parserCallback_drawstep(ParserNode *node) { drawstep->drawingCall = getDrawingFunctionCallback(functionName); if (drawstep->drawingCall == 0) - return parserError("%s is not a valid drawing function name", functionName.c_str()); + return parserError(functionName + " is not a valid drawing function name"); if (!parseDrawStep(node, drawstep, true)) return false; @@ -385,11 +385,11 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst #define __PARSER_ASSIGN_INT(struct_name, key_name, force) \ if (stepNode->values.contains(key_name)) { \ if (!parseIntegerKey(stepNode->values[key_name], 1, &x)) \ - return parserError("Error parsing key value for '%s'.", key_name); \ + return parserError("Error parsing key value for '" + Common::String(key_name) + "'."); \ \ drawstep->struct_name = x; \ } else if (force) { \ - return parserError("Missing necessary key '%s'.", key_name); \ + return parserError("Missing necessary key '" + Common::String(key_name) + "'."); \ } /** @@ -410,7 +410,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst blue = _palette[val].b; \ } else if (parseIntegerKey(val, 3, &red, &green, &blue) == false || \ red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255) \ - return parserError("Error parsing color struct '%s'", val.c_str());\ + return parserError("Error parsing color struct '" + val + "'");\ \ drawstep->struct_name.r = red; \ drawstep->struct_name.g = green; \ @@ -466,7 +466,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst else if (val == "right") drawstep->extraData = Graphics::VectorRenderer::kTriangleRight; else - return parserError("'%s' is not a valid value for triangle orientation.", val.c_str()); + return parserError("'" + val + "' is not a valid value for triangle orientation."); } } @@ -545,7 +545,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst else if (val == "gradient") drawstep->fillMode = Graphics::VectorRenderer::kFillGradient; else - return parserError("'%s' is not a valid fill mode for a shape.", stepNode->values["fill"].c_str()); + return parserError("'" + stepNode->values["fill"] + "' is not a valid fill mode for a shape."); } #undef __PARSER_ASSIGN_INT @@ -567,7 +567,7 @@ bool ThemeParser::parserCallback_def(ParserNode *node) { value = _theme->getEvaluator()->getVar(node->values["value"]); else if (!parseIntegerKey(node->values["value"], 1, &value)) - return parserError("Invalid definition for '%s'.", var.c_str()); + return parserError("Invalid definition for '" + var + "'."); _theme->getEvaluator()->setVar(var, value); return true; @@ -585,7 +585,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) { var = "Globals." + node->values["name"] + "."; if (!parseCommonLayoutProps(node, var)) - return parserError("Error parsing Layout properties of '%s'.", var.c_str()); + return parserError("Error parsing Layout properties of '" + var + "'."); } else { // FIXME: Shouldn't we distinguish the name/id and the label of a widget? @@ -606,7 +606,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) { width = _theme->getEvaluator()->getVar(node->values["width"]); else if (!parseIntegerKey(node->values["width"], 1, &width)) - return parserError("Corrupted width value in key for %s", var.c_str()); + return parserError("Corrupted width value in key for " + var); } if (node->values.contains("height")) { @@ -614,7 +614,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) { height = _theme->getEvaluator()->getVar(node->values["height"]); else if (!parseIntegerKey(node->values["height"], 1, &height)) - return parserError("Corrupted height value in key for %s", var.c_str()); + return parserError("Corrupted height value in key for " + var); } Graphics::TextAlign alignH = Graphics::kTextAlignLeft; diff --git a/gui/console.h b/gui/console.h index 442047ef78..50a00a1ad1 100644 --- a/gui/console.h +++ b/gui/console.h @@ -31,7 +31,7 @@ class ScrollBarWidget; /* FIXME #1: The console dialog code has some fundamental problems. First of, note the conflict between the (constant) value kCharsPerLine, and the - (variable) value _pageWidth. Look a bit at the code get familiar with them, + (variable) value _pageWidth. Look a bit at the code to get familiar with them, then return... Now, why don't we just drop kCharsPerLine? Because of the problem of resizing! When the user changes the scaler, the console will get resized. If the dialog @@ -47,7 +47,7 @@ class ScrollBarWidget; of making things like scrolling, drawing etc. more complicated. Either way, the current situation is bad, and we should resolve it one way - or the other (and if you can think of a thirds, feel free to suggest it). + or the other (and if you can think of a third, feel free to suggest it). diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 2f49cb2bbe..3973583d38 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -59,6 +59,7 @@ Debugger::Debugger() { DCmd_Register("quit", WRAP_METHOD(Debugger, Cmd_Exit)); DCmd_Register("help", WRAP_METHOD(Debugger, Cmd_Help)); + DCmd_Register("openlog", WRAP_METHOD(Debugger, Cmd_OpenLog)); DCmd_Register("debugflag_list", WRAP_METHOD(Debugger, Cmd_DebugFlagsList)); DCmd_Register("debugflag_enable", WRAP_METHOD(Debugger, Cmd_DebugFlagEnable)); @@ -475,6 +476,15 @@ bool Debugger::Cmd_Help(int argc, const char **argv) { return true; } +bool Debugger::Cmd_OpenLog(int argc, const char **argv) { + if (g_system->hasFeature(OSystem::kFeatureDisplayLogFile)) + g_system->displayLogFile(); + else + DebugPrintf("Opening the log file not supported on this system\n"); + return true; +} + + bool Debugger::Cmd_DebugFlagsList(int argc, const char **argv) { const Common::DebugManager::DebugChannelList &debugLevels = DebugMan.listDebugChannels(); diff --git a/gui/debugger.h b/gui/debugger.h index 6da569e0f8..b74b0d6f0f 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -69,7 +69,7 @@ protected: typedef Common::Functor2<int, const char **, bool> Debuglet; /** - * Convenience macro that makes it either to register a method + * Convenience macro that makes it easier to register a method * of a debugger subclass as a command. * Usage example: * DCmd_Register("COMMAND", WRAP_METHOD(MyDebugger, MyCmd)); @@ -190,6 +190,7 @@ private: protected: bool Cmd_Exit(int argc, const char **argv); bool Cmd_Help(int argc, const char **argv); + bool Cmd_OpenLog(int argc, const char **argv); bool Cmd_DebugFlagsList(int argc, const char **argv); bool Cmd_DebugFlagEnable(int argc, const char **argv); bool Cmd_DebugFlagDisable(int argc, const char **argv); diff --git a/gui/options.cpp b/gui/options.cpp index 5022b808c4..b0b9fe6c90 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -369,7 +369,7 @@ void OptionsDialog::close() { if (gfxError != OSystem::kTransactionSuccess) { // Revert ConfMan to what OSystem is using. - Common::String message = "Failed to apply some of the graphic options changes:"; + Common::String message = _("Failed to apply some of the graphic options changes:"); if (gfxError & OSystem::kTransactionModeSwitchFailed) { const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes(); @@ -380,17 +380,20 @@ void OptionsDialog::close() { } gm++; } - message += "\nthe video mode could not be changed."; + message += "\n"; + message += _("the video mode could not be changed."); } if (gfxError & OSystem::kTransactionAspectRatioFailed) { ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain); - message += "\nthe fullscreen setting could not be changed"; + message += "\n"; + message += _("the fullscreen setting could not be changed"); } if (gfxError & OSystem::kTransactionFullscreenFailed) { ConfMan.setBool("fullscreen", g_system->getFeatureState(OSystem::kFeatureFullscreenMode), _domain); - message += "\nthe aspect ratio setting could not be changed"; + message += "\n"; + message += _("the aspect ratio setting could not be changed"); } // And display the error @@ -1289,7 +1292,7 @@ void GlobalOptionsDialog::close() { // only become active *after* the options dialog has closed. g_gui.loadNewTheme(g_gui.theme()->getThemeId(), ThemeEngine::kGfxDisabled, true); #else - MessageDialog error(_("You have to restart ScummVM to take the effect.")); + MessageDialog error(_("You have to restart ScummVM before your changes will take effect.")); error.runModal(); #endif } diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex d696cc0d75..eb6cf3223f 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/po/POTFILES b/po/POTFILES index e96f15fb1b..fd70319f07 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -19,6 +19,7 @@ base/main.cpp common/error.cpp common/util.cpp +engines/advancedDetector.cpp engines/dialogs.cpp engines/scumm/dialogs.cpp engines/scumm/help.cpp @@ -31,6 +32,7 @@ engines/sci/engine/kfile.cpp engines/agos/saveload.cpp audio/fmopl.cpp +audio/mididrv.cpp audio/musicplugin.cpp audio/null.h audio/null.cpp @@ -40,7 +42,6 @@ audio/softsynth/appleiigs.cpp audio/softsynth/sid.cpp audio/softsynth/mt32.cpp audio/softsynth/pcspk.cpp -audio/softsynth/ym2612.cpp backends/keymapper/remap-dialog.cpp backends/midi/windows.cpp @@ -48,6 +49,7 @@ backends/platform/ds/arm9/source/dsoptions.cpp backends/platform/iphone/osys_events.cpp backends/graphics/sdl/sdl-graphics.cpp backends/graphics/opengl/opengl-graphics.cpp +backends/graphics/openglsdl/openglsdl-graphics.cpp backends/platform/symbian/src/SymbianActions.cpp backends/platform/symbian/src/SymbianOS.cpp backends/events/symbiansdl/symbiansdl-events.cpp @@ -56,3 +58,6 @@ backends/platform/wince/CEActionsPocket.cpp backends/platform/wince/CEActionsSmartphone.cpp backends/platform/wince/CELauncherDialog.cpp backends/platform/wince/wince-sdl.cpp +backends/events/gp2xsdl/gp2xsdl-events.cpp +backends/events/gph/gph-events.cpp +backends/events/openpandora/op-events.cpp diff --git a/po/ca_ES.po b/po/ca_ES.po index e625b9bcc4..a6c2188e85 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2010-09-21 23:12+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" @@ -16,108 +16,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: Catalan\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(compilat el %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Caracterэstiques compilades:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Motors disponibles:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Amunt" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Torna al nivell de directoris anterior" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Amunt" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "CancelЗla" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Escull" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Tanca" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Clic del ratolэ" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Mostra el teclat" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Remapeja les tecles" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "SelЗleccioneu una acciѓ a mapejar" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Mapeja" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "D'acord" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Seleccioneu una acciѓ i cliqueu 'Mapeja'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tecla associada : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tecla associada : cap" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Seleccioneu una acciѓ" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Premeu la tecla a associar" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Joc" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "Identificador:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -125,29 +125,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:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Tэtol complet del joc" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Idioma:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -155,285 +155,285 @@ msgstr "" "Idioma del joc. Aixђ no convertirр la vostra versiѓ Espanyola del joc a " "Anglшs" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<per defecte>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plataforma:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plataforma per la que el joc es va dissenyar originalment" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Platafor.:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grрfics" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Fer canvis sobre les opcions globals de grрfics" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Canviar les opcions de grрfics" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Рudio" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Fer canvis sobre les opcions globals d'рudio" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Canviar les opcions d'рudio" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Fer canvis sobre les opcions globals de volum" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Canviar les opcions de volum" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Fer canvis sobre les opcions globals de MIDI" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Canviar les opcions de MIDI" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Fer canvis sobre les opcions globals de MT-32" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Canviar les opcions de MT-32" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Camэ del joc:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Camэ joc:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Especifica el camэ de dades addicionals utilitzades pel joc" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Camэ de partides:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Especifica on es desaran les partides" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Partides:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Cap" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Per defecte" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Seleccioneu el fitxer SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Seleccioneu el directori amb les dades del joc" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Seleccioneu el directori addicional del joc" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Seleccioneu el directori de les partides desades" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~T~anca" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Surt de ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "~Q~uant a..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Quant a ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~pcions..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Canvia les opcions globals de ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~I~nicia" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Iniciant el joc seleccionat" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~C~arrega..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Carrega una partida pel joc seleccionat" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~A~fegeix Joc..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Mantingueu premut Shift per a l'Addiciѓ Massiva" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~E~dita Joc..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Canvia les opcions del joc" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~S~uprimeix Joc" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~fegeix Joc..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~dita Joc..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~S~uprimeix" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Cerca a la llista de jocs" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Cerca:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Neteja el valor" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Carrega partida:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Carrega" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -441,205 +441,222 @@ msgstr "" "Esteu segur que voleu executar el detector massiu de jocs? Aixђ pot afegir " "una gran quantitat de jocs." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sэ" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "No" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM no ha pogut obrir el directori especificat!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Seleccioneu el joc:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Realment voleu suprimir la configuraciѓ d'aquest joc?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Afegeix Jocs" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Addiciѓ Massiva..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Afegeix Joc..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Afegeix Joc..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... progrщs ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "S'ha acabat la cerca!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "S'han trobat %d jocs nous." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "S'han cercat %d directoris ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "S'han trobat %d jocs nous ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Mai" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "cada 5 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "cada 10 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "cada 15 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "cada 30 minuts" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Cap" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Mode grрfic:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Mode de pintat:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Modes de dispersiѓ especials suportats per alguns jocs" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Mode pantalla completa" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Disp. preferit:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 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:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 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:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferit:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib s'utilitza per la mњsica de molts jocs" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Freq. sortida:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -647,63 +664,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:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Dispositiu GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 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:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "Fitxer SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "Algunes targes de so, Fluidsynth i Timidity suporten SoundFont" -#: gui/options.cpp:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Mode combinat AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Guany MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -711,197 +728,198 @@ msgstr "" "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so " "compatible amb Roland connectat al vostre ordinador" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Activa el Mode Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 #, fuzzy msgid "Don't use Roland MT-32 music" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Veus" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Subtэtols" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Velocitat de subt.:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Veus" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Mostra els subtэtols i reprodueix la veu" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Veloc. de subt.:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Silenciar tot" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volum dels sons d'efectes especials" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Camэ dels temes:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Camэ temes:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Camэ dels connectors:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camэ de connectors:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Pintat GUI:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Desat automрtic:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-desat:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Tecles" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Idioma GUI:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfэcie d'usuari de ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Heu de reiniciar ScummVM perquш tots els canvis tingui efecte." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Seleccioneu el directori de les partides desades" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Seleccioneu el directori dels temes" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Seleccioneu el directori dels fitxers extra" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Seleccioneu el directori dels connectors" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -909,806 +927,830 @@ msgstr "" "El tema que heu seleccionat no suporta l'idioma actual. Si voleu utilitzar " "aquest tema primer haureu de canviar a un altre idioma." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "No hi ha data desada" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "No hi ha hora desada" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "No hi ha temps de joc desat" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Suprimeix" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Realment voleu suprimir aquesta partida?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Data: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Hora: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Temps de joc: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Partida sense tэtol" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Seleccioneu un Tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX desactivats" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX desactivats" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Pintat estрndard (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Estрndard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Pintat amb antialias (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Amb antialias (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "El motor no suporta el nivell de depuraciѓ '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Salta la lэnia" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Error al executar el joc:" -#: base/main.cpp:457 +#: base/main.cpp:456 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" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "" -#: common/error.cpp:44 +#: common/error.cpp:40 #, fuzzy msgid "Game data not found" msgstr "No s'han trobat les dades del joc" -#: common/error.cpp:46 +#: common/error.cpp:42 #, fuzzy msgid "Game id not supported" msgstr "Identificador de joc no suportat" -#: common/error.cpp:48 +#: common/error.cpp:44 #, fuzzy msgid "Unsupported color mode" msgstr "Mode de color no suportat" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "S'ha denegat el permэs de lectura" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "S'ha denegat el permэs d'escriptura" -#: common/error.cpp:56 +#: common/error.cpp:52 #, fuzzy msgid "Path does not exist" msgstr "El camэ no existeix" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "El camэ no щs un directori" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "El camэ no щs un fitxer" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "No s'ha pogut crear el fitxer" -#: common/error.cpp:65 +#: common/error.cpp:61 #, fuzzy msgid "Reading data failed" msgstr "Ha fallat la lectura" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Ha fallat l'escriptura de dades" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "" -#: common/error.cpp:72 +#: common/error.cpp:68 #, fuzzy msgid "Engine plugin does not support save states" msgstr "El motor no suporta el nivell de depuraciѓ '%s'" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "" - -#: common/error.cpp:79 +#: common/error.cpp:72 #, fuzzy msgid "Unknown error" msgstr "Error desconegut" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Verd" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Рmbar" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Verd" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Рmbar" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~C~ontinua" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "C~a~rrega" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~D~esa" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~pcions" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~A~juda" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~Q~uant a" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~R~etorna al Llanчador" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~R~etorna al Llanчador" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Desa la partida:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Desa" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~D~'acord" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~C~ancelЗla" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~ecles" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~A~nterior" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~S~egќent" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~T~anca" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 #, fuzzy msgid "Skip line of text" msgstr "Salta la lэnia" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 #, fuzzy msgid "Skip cutscene" msgstr "Salta la lэnia" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 #, fuzzy msgid "Space" msgstr "Veus" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 #, fuzzy msgid "Pause game" msgstr "Desa la partida:" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 #, fuzzy msgid "Load game state 1-10" msgstr "Carrega partida:" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 #, fuzzy msgid "Save game state 1-10" msgstr "Desa la partida:" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Surt" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 #, fuzzy msgid "Music volume up / down" msgstr "Volum de mњsica:" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 #, fuzzy msgid "Show / Hide console" msgstr "Mostra/Oculta el cursor" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 #, fuzzy msgid "Toggle aspect-ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr "" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr "" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +msgid " or incorrect game behavior." msgstr "" -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 #, fuzzy msgid "Main game controls:" msgstr "Canvia les opcions del joc" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 #, fuzzy msgid "Push" msgstr "Pausa" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 #, fuzzy msgid "Go to" msgstr "Amunt" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 #, fuzzy msgid "Turn off" msgstr "So engegat/parat" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 #, fuzzy msgid "Switch" msgstr "Veus" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 #, fuzzy msgid "Travel" msgstr "Desa" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 #, fuzzy msgid "KeyUp" msgstr "Tecles" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 #, fuzzy msgid "KeyDown" msgstr "Avall" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 #, fuzzy msgid "Tongue" msgstr "Zona" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 #, fuzzy msgid "Other game controls:" msgstr "Canvia les opcions del joc" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 #, fuzzy msgid "Switching characters:" msgstr "Commuta el personatge" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "" -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "" -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "" -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1719,7 +1761,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1730,7 +1772,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1741,273 +1783,331 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." msgstr "" -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Mode ~Z~ip activat" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~T~ransicions activades" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~E~fecte de l'aigua activat" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Desa la partida:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Restaura" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulador OPL de MAME" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Emulador OPL DOSBox" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Sense mњsica" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Emulador d'рudio Amiga" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Emulador d'AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Emulador d'Apple II GS (NO IMPLEMENTAT)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Emulador d'рudio C64" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Iniciant l'Emulador de MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Emulador Altaveu PC" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Emulador d'IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Emulador de FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Mapa de teclat:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Actiu)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Joc)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "MIDI de Windows" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Menњ Principal de ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Mode ~e~squerrр" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Controls de lluita de l'~I~ndy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Mostra el cursor del ratolэ" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Enganxa a les vores" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Desplaчament X del toc" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Desplaчament Y del toc" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Utilitza el control del cursor a l'estil del trackpad dels portрtils" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Toc per a clic esquerre, doble toc per a clic dret" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Sensibilitat" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Escalat inicial de la pantalla superior:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Escalat de la pantalla principal:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Escalat per hardware (rрpid, perђ de baixa qualitat)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Escalat per software (bona qualitat, perђ mщs lent)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Sense escalar (haureu de desplaчar-vos a esquerra i dreta)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Lluminositat:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Alta qualitat d'рudio (mщs lent) (reiniciar)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Desactiva l'apagat automрtic" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Mode Touchpad activat." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Mode Touchpad desactivat." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (sense escalar)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (no escalat)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Correcciѓ de la relaciѓ d'aspecte" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Correcciѓ de la relaciѓ d'aspecte" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +msgid "Active graphics filter:" +msgstr "" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Mode de pintat:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Mode de vэdeo actual:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Amunt" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Avall" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Esquerra" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Dreta" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Clic esquerre" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Clic dret" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zona" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Funciѓ Mњltiple" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Commuta el personatge" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Salta el text" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Mode rрpid" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Depurador" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Menњ global" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Teclat virtual" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Mapejador de tecles" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Vols sortir?" @@ -2128,129 +2228,183 @@ msgid "Network down" msgstr "Xarxa inactiva" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Iniciant la xarxa" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "S'ha excedit el temps d'iniciaciѓ de la xarxa" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Xarxa no iniciada (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Oculta la barra d'eines" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Mostra el teclat" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "So engegat/parat" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Clic dret" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Mostra/Oculta el cursor" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Vista lliure" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Amplia" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Redueix" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Mapeja tecles" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Cursor Amunt" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Cursor Avall" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Cursor Esquerra" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Cursor Dreta" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Voleu carregar o desar el joc?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Esteu segur de voler sortir? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Teclat" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Rotar" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Utilitzant el controlador SDL " -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Pantalla " -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Voleu fer una cerca automрtica?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volum" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volum" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "S'han trobat %d jocs nous." + +#~ msgid "FM Towns Emulator" +#~ msgstr "Emulador de FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Camэ incorrecte" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 69592b2c9b..6184e3686b 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-04-22 19:33+0100\n" -"PO-Revision-Date: 2011-04-23 10:55+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"PO-Revision-Date: 2011-06-07 16:23+0100\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,108 +20,108 @@ msgstr "" "X-Poedit-Country: CZECH REPUBLIC\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(sestaveno na %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Zakompilovanщ Funkce:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Dostupnс jсdra:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Jэt nahoru" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Jэt na pјedchozэ њroveђ adresсјe" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Jэt nahoru" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "ZruЙit" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Zvolit" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Zavјэt" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Kliknutэ myЙэ" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Zobrazit klсvesnici" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Pјemapovat klсvesy" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Zvolte шinnost k mapovсnэ" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Mapovat" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Zvolte шinnost a kliknьte 'Mapovat'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Pјiјazenс klсvesa: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Pјiјazenс klсvesa: Осdnс" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Prosэm vyberte шinnost" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Zmсшknьte klсvesu pro pјiјazenэ" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Hra" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -129,310 +129,310 @@ 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:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Jmщno" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "кpln§ nсzev hry" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Jmщno:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Jazyk:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 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:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<v§chozэ>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Platforma, pro kterou byla hra pљvodnь vytvoјena" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Obraz" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Zvuk" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Cesta pro uloОenэ:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Stanovuje, kam jsou umэstьny VaЙe uloОenщ hry" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Cesta pro uloОenэ:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Ўсdnщ" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "V§chozэ" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Vybrat SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Vyberte adresсј s daty hry" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Vyberte dodateшn§ adresсј hry" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Vyberte adresсј pro uloОenщ hry" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~U~konшit" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Ukonшit ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "~O~ Programu..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "O ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~V~olby..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Zmьnit globсlnэ volby ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~pustit" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Spustit zvolenou hru" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~N~ahrсt..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Nahrсt uloОenou pozici pro zvolenou hru" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~P~јidat hru..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "PodrОte Shift pro Hromadnщ Pјidсnэ" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~U~pravit Hru..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Zmьnit volby hry" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~O~dstranit Hru" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~P~јidat hru..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~U~pravit hru..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~O~dstranit hru" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Hledat v seznamu her" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Hledat:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Vyшistit hodnotu" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Nahrсt hru:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Nahrсt" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -440,204 +440,221 @@ msgstr "" "Opravdu chcete spustit hromadnou detekci her? Toto by mohlo potenciсlnь " "pјidat velkou spoustu her. " -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ano" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Ne" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nemohl tento adresсј otevјэt!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Vybrat hru:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Opravdu chcete odstranit nastavenэ tщto hry?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Hromadnщ Pјidсnэ..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Hromadnщ Pјidсnэ..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Pјidat Hru..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Pјidat Hru..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... prљbьh ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Hledсnэ dokonшeno!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Objeveno %d nov§ch her." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "Objeveno %d nov§ch her, ignorovсno %d dјэve pјidan§ch her." -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Prohledсno %d adresсјљ..." -#: gui/massadd.cpp:254 +#: gui/massadd.cpp:253 #, c-format -msgid "Discovered %d new games ..." -msgstr "Objeveno %d nov§ch her..." +msgid "Discovered %d new games, ignored %d previously added games ..." +msgstr "Objeveno %d nov§ch her, ignorovсno %d dјэve pјidan§ch her ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Nikdy" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "KaОd§ch 5 min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "KaОd§ch 10 min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "KaОd§ch 15 min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "KaОd§ch 30 min" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Ўсdnщ" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "reОim obrazu nemohl b§t zmьnьn." + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "ReОim obrazu:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "ReОim vykreslenэ:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "ReОim celщ obrazovky" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Korekce pomьru stran" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Korigovat pomьr stran pro hry 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "Nerozklсdсnэ EGA" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Povolit nerozklсdсnэ v EGA hrсch, kterщ to podporujэ" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Prioritnэ Zaјэzenэ:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Prioritnэ Zaј.:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib emulсtor" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "V§stup. frekvence:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -645,62 +662,62 @@ msgstr "" "VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi " "zvukovou kartou" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "GM Zaјэzenэ:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "NepouОэvat hudbu General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "PouОэt prvnэ dostupnщ zaјэzenэ" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "SmэЙen§ reОim AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "PouОэt obь zvukovщ generace MIDI a AdLib" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Zesэlenэ MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Zaјэzenэ MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -708,190 +725,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:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Zapnout reОim Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "NepouОэvat hudbu Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Text a иeш" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "иeш" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Titulky" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Oba" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "иeш" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Titl" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Zobrazit titulky a pјehrсvat јeш" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Rychlost titulkљ" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Ztlumit VЙe" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Hlasitost speciсlnэch zvukov§ch efektљ" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Vzhled:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI Vykreslovaш:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Klсvesy" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Jazyk GUI" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Jazyk GUI ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." -msgstr "Pro pouОitэ tьchto nastavenэ musэte restartovat ScummVM" +#: gui/options.cpp:1295 +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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Vybrat adresсј pro uloОenщ hry" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Vyberte adresсј pro vhledy GUI" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Vyberte adresсј pro dodateшnщ soubory" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Vyberte adresсј pro zсsuvnщ moduly" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -899,779 +916,805 @@ msgstr "" "Vzhled, kter§ jste zvolili, nepodporuje VсЙ souшasn§ jazyk. Pokud chcete " "tento vzhled pouОэt, musэte nejdјэve pјepnout na jin§ jazyk." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "NeuloОena Осdnс data" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Ўсdn§ uloОen§ шas" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Ўсdnс uloОenс doba hranэ" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Smazat" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Opravdu chcete tuto uloОenou hru vymazat" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Datum:" -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Шas:" -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Doba hranэ:" -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Bezejmenn§ uloОen§ stav" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Vyberte Vzhled" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX zakсzсno" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX zakсzсno" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standardnэ Vykreslovaш (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standardnэ (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Vykreslovaш s vyhlazen§mi hranami (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "S vyhlazen§mi hranami (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Jсdro nepodporuje њroveђ ladьnэ '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menu" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pauza" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Pјeskoшit јсdek" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Chyba pјi spuЙtьnэ hry:" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "Nelze nalщzt Осdnщ jсdro schopnщ vybranou hru spustit" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Ўсdnс chyba" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Data hry nenalezena" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Id hry nenэ podporovсno" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Nepodporovan§ barevn§ reОim" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Oprсvnьnэ ke шtenэ zamэtnuto" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Oprсvnьnэ k zсpisu zamэtnuto" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Cesta neexistuje" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Cesta nenэ adresсј" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Cesta nenэ soubor" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Nelze vytvoјit soubor" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Шtenэ dat selhalo" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Zсpis dat selhal" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Nelze nalщzt vhodn§ zсs. modul jсdra" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Zсs. modul jсdra nepodporuje uloОenщ stavy" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Argument pјэkazovщ јсdky nebyl zpracovсn" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Neznсmс chyba" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Zelenс" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Jantarovс" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Zelenс" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Jantarovс" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "Hra v '%s' se zdс b§t neznсmс." + +#: engines/advancedDetector.cpp:369 +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:371 +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.:" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" +"Bylo zjiЙtьno, Оe VaЙe verze hry pouОэvс jmщno souboru shodujэcэ se s " +"variantou %s." + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "Pokud je toto pљvodnэ a nezmьnьnс verze, ohlaste prosэm jakщkoli" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "pјedeЙle vypsanщ informace od ScummVM zpсtky t§mu." + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~P~okraшovat" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~N~ahrсt" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~U~loОit" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~V~olby" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~N~сpovьda" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~O~ programu" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~N~сvrat do SpouЙtьшe" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~N~сvrat do SpouЙtьшe" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "UloОit hru:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "UloОit" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~Z~ruЙit" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~K~lсvesy" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~јedchozэ" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~D~alЙэ" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~Z~avјэt" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "BьОnщ klсvesovщ pјэkazy" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Dialog Nahrсt / UloОit" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Pјeskoшit јсdek textu" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Mezernэk" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Pјeskoшit video" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Mezernэk" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pozastavit hru" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Nahrсt stav hry 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "UloОit stav hry 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Ukonшit" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Zapnout celou obrazovku" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Hlasitost hudby nahoru / dolљ" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Zv§Йit / SnэОit rychlost textu" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Napodobit levщ tlaшэtko myЙi" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Napodobit pravщ tlaшэtko myЙi" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Speciсlnэ klсvesovщ pјэkazy" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Ukсzat / Skr§t konzoli" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Spustit ladэcэ program" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Zobrazit spotјebu pamьti" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Spustit v rychlщm reОimu (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Spustit ve velmi rychlщm reОimu (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Povolit zachycovсnэ myЙi" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Pјepэnat mezi grafick§mi filtry" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "ZvьtЙit / ZmenЙit faktor zmьny velikosti" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Povolit korekci pomьru stran" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "Upozorђujeme, Оe pouОэvсnэ ctrl-f a" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g nenэ doporuшeno" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr "jelikoО mљОou zpљsobit pсd" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." -msgstr "nebo nesprсvnщ chovсnэ hry" +#: engines/scumm/help.cpp:110 +msgid " or incorrect game behavior." +msgstr " nebo nesprсvnщ chovсnэ hry." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Pletenэ nсшrtkљ na klсvesnici:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Hlavnэ ovlсdacэ prvky:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Tlaшit" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Tсhnout" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Dсt" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Otevјэt" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Jэt do" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Vzэt" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "PouОэt" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Pјeшэst" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Novщ dэtь" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Zapnout" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Vypnout" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Pјejэt na" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Sebrat" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Co je" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Odemknout" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Oblщct" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Svlщct" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Spravit" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Pјepnout" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Dэvat se" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Mluvit" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Cestovat" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Henrymu / Indymu" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "zahrсt c moll na pјeslici" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "zahrсt D na pјeslici" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "zahrсt E na pјeslici" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "zahrсt F na pјeslici" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "zahrсt G na pјeslici" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "zahrсt A na pјeslici" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "zahrсt B na pјeslici" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "zahrсt C dur na pјeslici" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "tlaшIt" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "tсhnout (Љkubnout)" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Mluvit s" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Dэvat se na" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "zapnouT" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "vypnoUt" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "KlсvesaNahoru" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Zv§raznit pјedchozэ dialog" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "KlсvesaDolљ" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Zv§raznit nсsledujэcэ dialog" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Jэt" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventсј" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objekt" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Шernobэlщ / Barva" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Oшi" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Jazyk" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Udeјit" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Kopnout" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Prohlщdnout" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Obyшejn§ kurzor" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Komunikace" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "UloОit / Nahrсt / Volby" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "DalЙэ ovlсdacэ prvky hry" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventсј:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Posunout seznam nahoru" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Posunout seznam dolu" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "PoloОka vlevo nahoјe" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "PoloОka vlevo dole" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "PoloОka vpravo nahoјe" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "PoloОka vpravo dole" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "PoloОka vlevo uprostјed" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "PoloОka vpravo uprostјed" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Mьnьnэ postav:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Druhщ dэtь" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Tјetэ dэtь" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Ovlсdсnэ boje (num. klсv.)" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Ustoupit" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Brсnit nahoјe" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Brсnit uprostјed" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Brсnit dole" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Udeјit nahoru" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Udeјit doprostјed" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Udeјit dolљ" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Tyto jsou pro Indyho nalevo." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "KdyО je Indy napravo," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "71 4 a 1 jsou zamьnьny s" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 a 3, v tomto poјadэ." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Kontrola dvojploЙnэku (numerickс klсvesnice)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Letьt doprava nahoru" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Letьt doleva" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Letьt doleva dolљ" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Letьt nahoru" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Letьt rovnь" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Letьt dolљ" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Letьt doprava nahoru" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Letьt doprava" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Letьt doprava dolљ" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1682,7 +1725,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1693,18 +1736,18 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" "\n" "%s" msgstr "" -"Stav hry њspeЙnь uloОen do:\n" +"Stav hry њspьЙnь uloОen do:\n" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1714,266 +1757,323 @@ msgstr "" "Abyste toto mohli hrсt, pјejdьte do 'Pјidat Hru' v poшсteшnэm menu ScummVM a " "vyberte adresсј 'Maniac' uvnitј hernэho adresсјe Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~R~eОim SviЙtьnэ Aktivovсn" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~P~јechody zapnuty" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "~Z~ahodit Strсnku" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "~Z~obrazit Mapu" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~E~fekt Vody Zapnut" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Obnovit hru" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Obnovit" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL Emulсtor" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL Emulсtor" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" +"Nelze zjistit zvolenщ zvukovщ zaјэzenэ '%s'. Podэvejte se na zсznam pro vэce " +"informacэ. Pokus o navrсcenэ na nejbliОЙэ dostupnщ zaјэzenэ..." + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" +"Nelze zjistit upјednostђovanщ zaјэzenэ '%s'. Podэvejte se na zсznam pro vэce " +"informacэ. Pokus o navrсcenэ na nejbliОЙэ dostupnщ zaјэzenэ..." + +#: audio/null.h:43 msgid "No music" msgstr "Bez hudby" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Emulсtor zvuku Amiga" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib Emulсtor" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS Emulсtor (NENЭ ZAVEDEN)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Emulсtor zvuku C64" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" -msgstr "SpouЙtэm MT-32 Emulсtor" +#: audio/softsynth/mt32.cpp:329 +msgid "Initializing MT-32 Emulator" +msgstr "Zavсdэm MT-32 Emulсtor" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32 Emulсtor" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC Speaker Emulсtor" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM PCjr Emulсtor" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM Towns Emulсtor" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Mapa Klсves:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr "(Aktivnэ)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr "(Globсlnэ)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr "(Hra)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Hlavnэ Menu ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~R~eОim pro levсky" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~O~vlсdсnэ Indyho boje" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Zobrazit kurzor myЙi" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Pјichytit k okrajљm" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Dotykovщ vyrovnсni na ose X" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Dotykovщ vyrovnсni na ose Y" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "PouОэt styl kontroly kurzoru jako u ovlсdacэ poduЙky laptopu" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Ћuknьte pro levщ kliknutэ, dvakrсt pro pravщ kliknutэ" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Citlivost" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Poшсteшnэ zmьna velikosti hornэ obrazovky:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Zmьna velikosti hlavnэ obrazovky:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Hardwarovс zmьna velikosti (rychlщ, ale nэzkс kvalita)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Softwarovс zmьna velikosti (dobrс kvalita, ale pomalejЙэ)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Beze zmьny velikosti (musэte posunovat doleva a doprava)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Jas:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Vysokс kvalita zvuku (pomalejЙэ) (restart) " -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Zakсzat vypnutэ" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad reОim zapnut" -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Touchpad reОim vypnut" -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normсlnэ (bez zmьny velikosti)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normсlnэ (bez zmьny velikosti)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +msgid "Enabled aspect ratio correction" +msgstr "Povolena korekce pomьru stran" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +msgid "Disabled aspect ratio correction" +msgstr "Zakсzсna korekce pomьru stran" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +msgid "Active graphics filter:" +msgstr "Aktivnэ grafick§ filtr:" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +msgid "Windowed mode" +msgstr "ReОim do okna" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normсlnэ" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Zachovсvajэcэ" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Pљvodnэ" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +msgid "Current display mode" +msgstr "Souшasn§ reОim obrazu" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "Souшasnс velikost" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "Aktivnэ reОim filtru: Lineсrnэ" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "Aktivnэ reОim filtru: NejbliОЙэ" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Nahoru" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Dolљ" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Doleva" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Doprava" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Levщ Kliknutэ" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Pravщ kliknutэ" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Oblast" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multi Funkce" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Zamьnit znaky" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Pјeskoшit text" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Rychl§ reОim" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Ladэcэ program" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Globсlnэ menu" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Virtuсlnэ klсvesnice" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Mapovaш klсves" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Chcete ukonшit?" @@ -2094,135 +2194,188 @@ msgid "Network down" msgstr "SэЛ je nedostupnс" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" -msgstr "SpouЙtэm sэЛ" +msgid "Initializing network" +msgstr "Zavсdэm sэЛ" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" -msgstr "Pјi spouЙtьnэ sэtь vyprЙel limit" +msgid "Timeout while initializing network" +msgstr "Pјi zavсdьnэ sэtь vyprЙel limit" #: backends/platform/wii/options.cpp:186 #, c-format -msgid "Network not initialised (%d)" -msgstr "SэЛ nenэ zapnuta (%d)" +msgid "Network not initialized (%d)" +msgstr "SэЛ nenэ zavedena (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Skr§t Panel nсstrojљ" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Zobrazit klсvesnici" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Zvuk zapnout/vypnout" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Pravщ kliknutэ" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Ukсzat/Skr§t Kurzor" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "RozhlэОenэ pomocэ myЙi" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "PјiblэОenэ nahoru" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "PјiblэОenэ dolљ" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Pјiјadit klсvesy" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Љipka Nahoru" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Љipka Dolљ" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Љipka Doleva" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Љipka Doprava" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Chcete hru nahrсt nebo uloОit?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Jste si jisti, Оe chcete odejэt ? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Klсvesnice" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Otсшet" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "PouОэvс ovladaш SDL" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Displej" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Chcete provщst automatickщ hledсnэ?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Mapovat шinnost pravщ kliknutэ" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Musэte namapovat klсvesu pro шinnost 'Pravщ Kliknutэ', abyste tuto hru mohli " "hrсt" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Mapovat шinnost skr§t panel nсstrojљ" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Musэte namapovat klсvesu pro шinnost 'Skr§t Panel nсstrojљ', abyste tuto hru " "mohli hrсt" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Namapovat шinnost PјiblэОit Nahoru (nepovinnщ)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Namapovat шinnost PјiblэОit Dolљ (nepovinnщ)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Nezapomeђte namapovat klсvesu k шinnosti 'Skr§t Panel Nсstrojљ, abyste " "vidьli cel§ inventсј" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Levщ Kliknutэ" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Pravщ Kliknutэ" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Najetэ (Bez Kliknutэ)" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +msgid "Maximum Volume" +msgstr "Maximсlnэ Hlasitost" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "ZvyЙuji Hlasitost" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +msgid "Minimal Volume" +msgstr "Minimсlnэ Hlasitost" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "SniОuji Hlasitost" + +#~ msgid "Discovered %d new games." +#~ msgstr "Objeveno %d nov§ch her." + +#~ msgid "Command line argument not processed" +#~ msgstr "Argument pјэkazovщ јсdky nebyl zpracovсn" + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM Towns Emulсtor" + #~ msgid "Invalid Path" #~ msgstr "Neplatnс Cesta" diff --git a/po/da_DA.po b/po/da_DA.po index 8e77f376ac..3c5d8c98ef 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+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" @@ -16,108 +16,108 @@ msgstr "" "Language: Dansk\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(bygget den %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Funktioner kompileret ind:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Tilgцngelige \"motorer\":" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Gх op" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Gх til forrige biblioteks niveau" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Gх op" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Fortryd" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vцlg" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Luk" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Muse klik" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Kortlцg taster" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Vцlg en handling at kortlцgge" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Kortlцg" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Vцlg en handling og klik 'Kortlцg'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tilknyttet tast : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tilknyttet tast : ingen" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Vцlg venligst en handling" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Tryk tasten for at tilknytte" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Spil" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -125,29 +125,29 @@ msgstr "" "Kort spil identifikator til brug for gemmer, og for at kјre spillet fra " "kommandolinien" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Fuld titel pх spillet" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Sprog:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -155,282 +155,282 @@ msgstr "" "Spillets sprog. Dette vil ikke цndre din spanske version af spillet til " "engelsk" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Platform som spillet oprindeligt var designet til" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Lyd" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Angiver sti til ekstra data der bruges i spillet" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Gemme sti:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Gemme sti:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Vцlg SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Vцlg bibliotek med spil data" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Vцlg ekstra spil bibliotek" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Vцlg bibliotek til spil gemmer" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~fslut" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Afslut ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~I~ndstillinger..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Цndre globale ScummVM indstillinger" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Start det valgte spil" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~H~ent..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Hent gemmer for det valgte spil" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~T~ilfјj spil..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Hold Skift for at tilfјje flere" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~R~ediger spil..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Цndre spil indstillinger" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~F~jern spil" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~T~ilfјj spil..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~R~ediger spil..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~F~jern spil" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Sјg i spil liste" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Sјg:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Slet vцrdi" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Indlцs spil:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Indlцs" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -438,205 +438,222 @@ msgstr "" "Vil du virkelig kјre fler spils detektoren? Dette kunne potentielt tilfјje " "et stort antal spil." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nej" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunne ikke хbne det angivne bibliotek!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Vцlg spillet:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Vil du virkelig fjerne denne spil konfiguration?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Tilfјj flere..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Tilfјj flere..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Tilfјj spil..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Tilfјj spil..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... fremskridt ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Skan gennemfјrt!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Fundet %d nye spil." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Gennemset %d biblioteker ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Fundet %d nye spil ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "hvert 5. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "hvert 10. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "hvert 15. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "hvert 30. minut" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Grafik tilstand:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understјttet a nogle spil" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Fuldskцrms tilstand" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Billedformat korrektion" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrekt billedformat til 320x200 spil" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA farveforјgelse" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Aktiver farveforјgelse i EGA spil der understјtter det" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Foretruk. enhed:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretruk. enh.:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -644,60 +661,60 @@ msgstr "" "Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit " "lydkort" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "GM enhed:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Angiver standard lyd enhed for General MIDI udgang" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Brug ikke General MIDI musik" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Brug fјrste tilgцngelig enhed" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Blandet AdLib/MIDI tilstand" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Brug bхde MIDI og AdLib lyd generering" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "MIDI lydstyrke:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "MT-32 enhed:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -705,190 +722,191 @@ msgstr "" "Kontroller om du vil bruge din rigtige hardware Roland-kompatible lyd enhed " "tilsluttet til din computer" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Цgte Roland MT-32 (ingen GM emulering)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Aktivщr Roland GS tilstand" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Brug ikke Roland MT-32 musik" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Begge" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Vis undertekster og afspil tale" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Mute alle" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI renderer:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Sprog:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, 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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Vцlg bibliotek til gemmer" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Vцlg bibliotek for GUI temaer" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Vцlg bibliotek for plugins" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -896,786 +914,811 @@ msgstr "" "Temaet du valgte understјtter ikke dit aktuelle sprog. Hvis du јnsker at " "bruge dette tema, skal du skifte til et andet sprog fјrst." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Ingen dato gemt" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Intet tidspunkt gemt" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Ingen spilletid gemt" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Slet" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Vil du virkelig slette denne gemmer?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Dato:" -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Tid:" -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Spilletid:" -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Unavngivet gemmetilstand" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Vцlg et tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Deaktiveret GFX" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Deaktiveret GFX" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standard renderer (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Antialias renderer (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Antialias (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motor understјtter ikke fejlfindingsniveau '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menu" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Spring linje over" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Fejl ved kјrsel af spil:" -#: base/main.cpp:457 +#: base/main.cpp:456 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" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "" -#: common/error.cpp:44 +#: common/error.cpp:40 #, fuzzy msgid "Game data not found" msgstr "Spil data ikke fundet" -#: common/error.cpp:46 +#: common/error.cpp:42 #, fuzzy msgid "Game id not supported" msgstr "Spil id ikke understјttet" -#: common/error.cpp:48 +#: common/error.cpp:44 #, fuzzy msgid "Unsupported color mode" msgstr "Ikke understјttet farve tilstand" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Lцse rettighed nцgtet" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Skrive rettighed nцgtet" -#: common/error.cpp:56 +#: common/error.cpp:52 #, fuzzy msgid "Path does not exist" msgstr "Sti eksistere ikke" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Sti ikke et bibliotek" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Sti ikke en fil" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Kan ikke oprette fil" -#: common/error.cpp:65 +#: common/error.cpp:61 #, fuzzy msgid "Reading data failed" msgstr "Lцsning fejlet" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Skrivning af data fejlet" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "" -#: common/error.cpp:72 +#: common/error.cpp:68 #, fuzzy msgid "Engine plugin does not support save states" msgstr "Motor understјtter ikke fejlfindingsniveau '%s'" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "" - -#: common/error.cpp:79 +#: common/error.cpp:72 #, fuzzy msgid "Unknown error" msgstr "Ukendt fejl" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules grјn" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules brun" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules grјn" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules brun" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "Gen~o~ptag" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~H~ent" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~G~em" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~I~ndstillinger" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "H~j~цlp" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~O~m" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~R~etur til spiloversigt" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~R~etur til oversigt" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Gemmer:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Gem" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~F~ortryd" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~aster" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "Fo~r~rige" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~N~цste" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~L~uk" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Almindelige tastatur kommandoer:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Gem / Hent dialog" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Spring tekstlinje over" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Spring mellemscene over" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Mellemrum" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pause spil" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Hent spil tilstand 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Gem spil tilstand 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Afslut" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Skift fuldskцrm" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Musik lydstyrke op / ned" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Tekst hastighed langsommere / hurtigere" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simulere venstre museknap" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simulere hјjre museknap" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Specielle tastatur kommandoer:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Vis / Skjul konsol" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Start fejlfinder" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Vis hukommelsesforbrug" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Kјr i hurtig tilstand (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Kјr i meget hurtig tilstand (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Skift muse fanger" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Skift mellem grafik filtre" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Hцv / Sцnk skaleringsfaktor" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Skift billedformat korrektion" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Bemцrk at brug af ctrl-f og" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g ikke kan ikke anbefales" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " siden de kan skabe nedbrud" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " eller ukorrekt opfјrsel af spil." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Spind ordspil pх tastaturet:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Vigtigste spilstyring:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Skub" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Trцk" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Giv" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Хbn" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Gх til" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Tag" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Brug" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Lцs" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Nyt barn" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Tцnd" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Sluk" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Gх til" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Tag op" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Hvad er" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Lхs op" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Tag pх" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Tag af" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Lav" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Skift" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Se" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Tal" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Rejs" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Til Henry / Til Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "spil C-mol pх rok" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "spil D pх rok" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "spil E pх rok" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "spil F pх rok" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "spil G pх rok" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "spil A pх rok" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "spil H pх rok" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "spil C-dur pх rok" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Skub" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "trцk (Y)" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Tal til" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Lur pх" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "tцNd" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "sluk (F)" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "TastOp" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Fremhцv forrige dialog" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "TastNed" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Fremhцv nцste dialog" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Gх" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Oversigt" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objekt" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Sort og hvid / Farve" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "иjne" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Tunge" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Slag" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Spark" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Undersјg" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Normal markјr" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Komm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Gem / Hent / Indstillinger" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Andre spil kontroller" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Oversigt:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Rul liste op" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Rul liste ned" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "иverste venstre punkt" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Nederste hјjre punkt" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "иverste hјjre punkt" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Nederste venstre punkt" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Midterste hјjre punkt" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Midterste hјjre punkt" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Skift personer:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Andet barn" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Tredie barn" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Kamp kontroller (numtast):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Skridt tilbage" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Blokщr hјjt" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Blokщr midtfor" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Blokщr lavt" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Slх hјjt" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Slх midtfor" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Slх lavt" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Disse er for Indy til venstre" -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Nхr Indy er til hјjre," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4 og 1 bliver bytte med" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "repektivt 9, 6 og 3." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Biplan kontroller (numtast):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Flyv јverst til venste" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Flyv til venstre" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Flyv nederst til venstre" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Flyv opad" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Flyv ligeud" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Flyv nedad" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Flyv јverst til hјjre" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Flyv til hјjre" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Flyv nederst til hјjre" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1686,7 +1729,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1697,7 +1740,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1708,273 +1751,332 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." msgstr "" -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~Z~ip tilstand aktiveret" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~O~vergange aktiveret" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~V~andeffekter aktiveret" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Gendan spil:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Gendan" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Ingen musik" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Amiga lyd emulator" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib emulator" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS emulator (IKKE IMPLEMENTERET)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64 lyd emulator" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Initialisere MT-32 emulator" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32 emulator" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC Speaker emulator" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM PCjr emulator" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM Towns emulator" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Tasteoversigt:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Aktiv)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Spil)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "ScummVM Hovedmenu" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~V~enstrehхndstilstand " -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~I~ndy kamp styring" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Vis muse markјr" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Hцft til hjјrner" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Touch X forskydning" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Touch Y forskydning" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Brug bцrbar museplade-agtig markјr kontrol" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Tryk for venstre klik, dobbelt tryk for hјjre klik" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Fјlsomhed" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Skalering af јverste skцrm ved opstart:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Hovedskцrm skalering" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Hardware skalering (hurtig, men lav kvalitet)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Software skalering (god kvalitet, men langsommere)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Ikke skaleret (du skal rulle til venstre og hјjre)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Lysstyrke:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Hјj lydkvalitet (langsommere) (genstart)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Deaktiver slukning" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Pegeplade tilstand aktiveret." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Pegeplade tilstand deaktiveret." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Skift billedformat korrektion" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Skift billedformat korrektion" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Skift mellem grafik filtre" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Rendere tilstand:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Bevar" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Aktuel videotilstand:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Op" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Ned" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Venstre" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Hјjre" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Venstre klik" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Hјjre klik" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zone" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multi funktion" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Skift person" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Spring tekst over" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Hurtig tilstand" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Fejlsјger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Global menu" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Virtuelt tastatur" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Tastetildeling" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Vil du afslutte?" @@ -2095,134 +2197,188 @@ msgid "Network down" msgstr "Netvцrk nede" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Initialisere netvцrk" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Tidsgrцnse nхet ved initialisering af netvцrk" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Netvцrk ikke initialiseret (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Skjul vцrktјjslinje" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Vis tastatur" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Lyd til/fra" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Hјjre klik" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Vis/skjul markјr" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Fri udsigt" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Formindsk" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Forstјr" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Tildel taster" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Pil op" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Pil ned" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Pil til venstre" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Pil til hјjre" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vil du hente eller gemme spillet?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Er du sikker pх at du vil afslutte ? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Tastatur" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Drej" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Brug SDL driver" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Vis" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Vil du udfјre en automatisk skanning ?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Tildel hјjreklikshandling" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du skal tildele en tast til 'Hјjreklik' handlingen for at spille dette spil" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Tildel \"skjul vцrktјjslinje\" handling" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Du skal tildele en tast til 'Skjul vцrktјjslinje' handlingen for at spille " "dette spil" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Tildel Formindsk handling (valgfri)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Tildel Forstјr handling (valgfri)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Glem ikke at tildele en tast til 'Skjul vцrktјjslinje' handling for at se " "hele oversigten" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Lydstyrke" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Lydstyrke" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Fundet %d nye spil." + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM Towns emulator" + #~ msgid "Invalid Path" #~ msgstr "Ugyldig sti" diff --git a/po/de_DE.po b/po/de_DE.po index ac167b785f..79e1d2d0c3 100755..100644 --- a/po/de_DE.po +++ b/po/de_DE.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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-04-24 12:35+0100\n" "Last-Translator: Simon Sawatzki <SimSaw@gmx.de>\n" "Language-Team: Lothar Serra Mari <Lothar@Windowsbase.de> & Simon Sawatzki " @@ -18,108 +18,108 @@ msgstr "" "Language: Deutsch\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(erstellt am %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Verwendete Funktionen:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Verfќgbare Spiele-Engines:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Pfad hoch" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Zu hіherer Pfadebene wechseln" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Pfad hoch" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Abbrechen" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Auswфhlen" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Schlieпen" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Mausklick" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Tastatur anzeigen" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Tasten neu zuweisen" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Eine Aktion zum Zuweisen auswфhlen" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Zuweisen" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Aktion auswфhlen und \"Zuweisen\" klicken" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Zugewiesene Taste: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Zugewiesene Taste: keine" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Bitte eine Aktion auswфhlen" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Taste drќcken, um sie zuzuweisen" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Spiel" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "Kennung:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -127,29 +127,29 @@ msgstr "" "Kurzer Spielname, um die Spielstфnde zuzuordnen und das Spiel von der " "Kommandozeile aus starten zu kіnnen" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Name:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Voller Name des Spiels" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Name:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Sprache:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -157,284 +157,284 @@ msgstr "" "Sprache des Spiels. Diese Funktion wird nicht eine spanische Version des " "Spiels in eine deutsche verwandeln." -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<Standard>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plattform, fќr die das Spiel ursprќnglich erstellt wurde" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Globale Grafikeinstellungen ќbergehen" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globale Grafikeinstellungen ќbergehen" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Audio" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Globale Audioeinstellungen ќbergehen" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Globale Audioeinstellungen ќbergehen" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Lautstфrke" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Lautst." -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Globale Lautstфrke-Einstellungen ќbergehen" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Globale Lautstфrkeeinstellungen ќbergehen" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Extrapfad:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Legt das Verzeichnis fќr zusфtzliche Spieldateien fest." -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Extrapfad:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Spielstфnde:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Legt fest, wo die Spielstфnde abgelegt werden." -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Speichern:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Keiner" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "SoundFont auswфhlen" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Verzeichnis mit Spieldateien auswфhlen" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Verzeichnis mit zusфtzlichen Dateien auswфhlen" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~B~eenden" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "ScummVM beenden" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "мbe~r~" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "мber ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~ptionen" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Globale ScummVM-Einstellungen bearbeiten" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~tarten" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Ausgewфhltes Spiel starten" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~L~aden..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Spielstand fќr ausgewфhltes Spiel laden" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "Spiel ~h~inzufќgen" -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "" "Umschalttaste (Shift) gedrќckt halten, um Verzeichnisse nach Spielen zu " "durchsuchen" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "Spielo~p~tionen" -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Spieloptionen фndern" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "Spiel ~e~ntfernen" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~H~inzufќgen" -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Spielo~p~tion" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~E~ntfernen" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "In Spieleliste suchen" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Suchen:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Wert lіschen" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Spiel laden:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Laden" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -442,207 +442,226 @@ 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:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nein" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM konnte das gewфhlte Verzeichnis nicht іffnen!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM konnte im gewфhlten Verzeichnis kein Spiel finden!" -#: gui/launcher.cpp:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Spiel auswфhlen:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Mіchten Sie wirklich diese Spielkonfiguration entfernen?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Durchsuchen" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Durchsuchen" -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Hinzufќgen" -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Spiel hinzufќgen" -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... lфuft..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Suchlauf abgeschlossen!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "%d neue Spiele gefunden." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "%d Ordner durchsucht..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d neue Spiele gefunden..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Niemals" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "alle 5 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "alle 10 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "alle 15 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "alle 30 Minuten" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "-" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Grafikmodus:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Render-Modus:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "" "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt." -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Vollbildmodus" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Seitenverhфltnis korrigieren" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "Antifehlerdiffusion fќr EGA" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" -msgstr "Aktiviert die Aufhebung der Fehlerdiffusion in EGA-Spielen, die dies unterstќtzen." +msgstr "" +"Aktiviert die Aufhebung der Fehlerdiffusion in EGA-Spielen, die dies " +"unterstќtzen." -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib-Emulator" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet." -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Ausgabefrequenz:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -650,64 +669,64 @@ msgstr "" "Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise " "nicht von jeder Soundkarte unterstќtzt." -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "GM-Gerфt:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 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:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Keine General-MIDI-Musik" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Erstes verfќgbares Gerфt" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib-/MIDI-Modus" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Benutzt MIDI und AdLib zur Sounderzeugung." -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "MIDI-Lautstфrke:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "MT-32-Gerфt:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Echte Roland-MT-32-Emulation (GM-Emulation deaktiviert)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -715,975 +734,1001 @@ 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:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland-MT-32-Emulation (kein GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Roland-GS-Modus" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Keine Roland-MT-32-Musik" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Sprache und Text:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Sprache" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Untertitel" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Beides" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Untertitel-Tempo:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Sprache + Text:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Spr." -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "TXT" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "S+T" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Untertitel anzeigen und Sprachausgabe aktivieren" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Text-Tempo:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Alles aus" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Effektlautstфrke:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Lautstфrke spezieller Soundeffekte" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Effektlautst.:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Sprachlautstфrke:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Sprachlautst.:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Themenpfad:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Themenpfad:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Plugin-Pfad:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin-Pfad:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Sonstiges" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Andere" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI-Renderer:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autom. Speichern:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Speich.(auto)" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Tasten" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Sprache:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Sprache der ScummVM-Oberflфche" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Sie mќssen ScummVM neu starten, um die Einstellungen zu ќbernehmen." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Verzeichnis fќr Oberflфchen-Themen" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 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:1335 +#: gui/options.cpp:1389 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." msgstr "" -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Kein Datum gespeichert" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Keine Zeit gespeichert" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Keine Spielzeit gespeichert" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Lіschen" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Diesen Spielstand wirklich lіschen?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Datum: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Zeit: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Spieldauer: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Unbenannt" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Thema auswфhlen" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX ausgeschaltet" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX ausgeschaltet" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standard-Renderer (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Kantenglфttung (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Kantenglфttung (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Engine unterstќtzt den Debug-Level \"%s\" nicht." -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menќ" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Zeile ќberspringen" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Fehler beim Ausfќhren des Spiels:" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "Konnte keine Spiel-Engine finden, die dieses Spiel starten kann." -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Kein Fehler" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Spieldaten nicht gefunden" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Spielkennung nicht unterstќtzt" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Farbmodus nicht unterstќtzt" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Lese-Berechtigung nicht vorhanden" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Schreib-Berechtigung nicht vorhanden" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Verzeichnis existiert nicht." -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Ungќltiges Verzeichnis" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Pfad ist keine Datei." -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Kann Datei nicht erstellen." -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Daten konnten nicht gelesen werden." -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Daten konnten nicht geschrieben werden." -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Konnte kein passendes Engine-Plugin finden." -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Engine-Plugin unterstќtzt keine Speicherstфnde." -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Argument in Kommandozeile nicht verarbeitet" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules-Grќn" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules-Bernsteingelb" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules-Grќn" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules-Gelb" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~F~ortsetzen" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~L~aden" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~S~peichern" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~ptionen" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~H~ilfe" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "мbe~r~" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "Zur Spiele~l~iste zurќck" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "Zur Spiele~l~iste" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Speichern:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Speichern" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~A~bbrechen" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~asten" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~Z~urќck" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~W~eiter" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~S~chlieпen" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Allgemeine Tastenbefehle:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Menќ zum Speichern/Laden" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Textzeile ќberspringen" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Zwischensequenz ќberspringen" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Leertaste" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Spielpause" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Strg" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Spielstand 1-10 laden" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Spielstand 1-10 speichern" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Beenden" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Vollbild-/Fenster-Modus" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Musiklautstфrke hіher/niedriger" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Texttempo langsamer/schneller" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Linke Maustaste simulieren" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tabulator" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Rechte Maustaste simulieren" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Spezielle Tastenbefehle:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Konsole zeigen/verbergen" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Debugger starten" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Speicherverbrauch anzeigen" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Schneller Modus (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Sehr schneller Modus (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Mauseingrenzung in Fenster an/aus" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Zwischen Grafikfiltern wechseln" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Grіпenverhфtlnis hіher/niedriger" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Seitenverhфltnis anpassen: an/aus" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Es wird davon abgeraten," -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " Strg+f und Strg+g zu verwenden," -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " da dies Abstќrze oder fehlerhaftes" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " Spielverhalten verursachen kann." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Sprќche mit Tastatur spinnen:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Hauptspielsteuerung:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Drќcke" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Ziehe" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Gib" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "жffne" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Gehe zu" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Nimm" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Benutze" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Lies" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Person" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Schalt ein" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Schalt aus" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Gehe zu" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Nimm" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Was ist" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Schlieп auf" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Zieh an" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Nimm ab" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Reparier" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Wechsle" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Schau" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Rede" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Reise" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Zu Henry/Zu Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "spiele tiefes C auf Stab" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "spiele D auf Stab" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "spiele E auf Stab" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "spiele F auf Stab" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "spiele G auf Stab" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "spiele A auf Stab" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "spiele B auf Stab" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "spiele hohes C auf Stab" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Drќcke" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Ziehe" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Rede mit" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Schau an" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Mach an" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Mach aus" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Hoch-Taste" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Vorige Dialogwahl markieren" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Runter-Taste" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Nфchste Dialogwahl markieren" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Gehe" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventar" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objekt" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Graustufen-Modus/Farbe" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Augen" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Zunge" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Schlage" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Tritt" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Betrachte" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Normaler Mauszeiger" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Kommunikation" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Speichern / Laden / Optionen" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Weitere Steuerung:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventar:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Liste hochblфttern" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Liste runterblфttern" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Oberer linker Gegenstand" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Unterer linker Gegenstand" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Oberer rechter Gegenstand" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Unterer rechter Gegenstand" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Mittlerer linker Gegenstand" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Mittlerer rechter Gegenstand" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Figuren wechseln:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Zweites Kind" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Drittes Kind" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Kampfsteuerung (Ziffernblock):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Schritt zurќck" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Deckung oben" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Deckung Mitte" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Deckung unten" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Schlag oben" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Schlag Mitte" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Schlag unten" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Dies gilt fќr Indy links." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Wenn Indy rechts steht," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "werden 7, 4 und 1 je mit" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 und 3 vertauscht." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Doppeldecker (Ziffernblock):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Nach oben links fliegen" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Nach links fliegen" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Nach unten links fliegen" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Nach oben fliegen" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Geradeaus fliegen" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Nach unten fliegen" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Nach oben rechts fliegen" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Nach rechts fliegen" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Nach unten rechts fliegen" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1694,7 +1739,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1705,7 +1750,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1716,273 +1761,336 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." -msgstr "Normalerweise wќrde jetzt Maniac Mansion starten. ScummVM kann das jedoch noch nicht. Um dieses Spiel zu spielen, klicken Sie auf \"Spiel hinzufќgen\" im Startmenќ von ScummVM und wфhlen das Verzeichnis \"Maniac\" im Verzeichnis dieses Spiels aus." +msgstr "" +"Normalerweise wќrde jetzt Maniac Mansion starten. ScummVM kann das jedoch " +"noch nicht. Um dieses Spiel zu spielen, klicken Sie auf \"Spiel hinzufќgen\" " +"im Startmenќ von ScummVM und wфhlen das Verzeichnis \"Maniac\" im " +"Verzeichnis dieses Spiels aus." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~Z~ip-Modus aktiviert" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "мber~g~фnge aktiviert" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~W~assereffekt aktiviert" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Spiel laden:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Laden" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME-OPL-Emulator" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox-OPL-Emulator" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Keine Musik" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Amiga-Audio-Emulator" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib-Emulator" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple-II-GS-Emulator (NICHT INTEGRIERT)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64-Audio-Emulator" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "MT-32-Emulator wird gestartet..." -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32-Emulation" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC-Lautsprecher-Emulator" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM-PCjr-Emulator" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM-Towns-Emulator" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Tasten-Layout:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Aktiv)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Spiel)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "ScummVM-Hauptmenќ" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~L~inke-Hand-Modus" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~K~ampfsteuerung fќr Indiana Jones" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Mauszeiger anzeigen" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "An Ecken anheften" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Zu X-Position gehen" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Zu Y-Position gehen" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Den Trackpad-Style fќr Maussteuerung benutzen" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Tippen fќr Linksklick, Doppeltippen fќr Rechtsklick" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Empfindlichkeit" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Vergіпerung des oberen Bildschirms:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Hauptbildschirm-Skalierung:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Hardware-Skalierung (schnell, aber schlechte Qualitфt)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Software-Skalierung (gute Qualitфt, aber langsamer)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Nicht skalieren (Sie mќssen nach links und nach rechts scrollen)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Helligkeit:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Hohe Audioqualitфt (lansamer) (erfordert Neustart)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Stromsparmodus abschalten" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad-Modus aktiviert." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Touchpad-Modus ausgeschaltet." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (keine Skalierung)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal ohn.Skalieren" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Seitenverhфltnis anpassen: an/aus" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Seitenverhфltnis anpassen: an/aus" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Zwischen Grafikfiltern wechseln" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Render-Modus:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Aktueller Videomodus:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Hoch" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Runter" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Links" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Rechts" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Linksklick" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Rechtsklick" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zone" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multifunktion" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Figur wechseln" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Text ќberspringen" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Schneller Modus" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Hauptmenќ" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Virtuelle Tastatur" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Tasten zuordnen" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Mіchten Sie beenden?" @@ -2103,135 +2211,192 @@ msgid "Network down" msgstr "Netzwerk ist aus." #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Netzwerk wird gestartet..." #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Zeitќberschreitung beim Starten des Netzwerks" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Netzwerk nicht gestartet (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Werkzeugleiste verbergen" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Tastatur zeigen" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Ton ein/aus" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Rechtsklick" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Cursor zeigen/verbergen" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Freie Ansicht" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Herauszoomen" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Hineinzoomen" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Tasten zuweisen" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Zeiger hoch" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Zeiger runter" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Zeiger nach links" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Zeiger nach rechts" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Mіchten Sie ein Spiel laden oder speichern?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Mіchten Sie wirklich beenden? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Tastatur" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Drehen" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Verwende SDL-Treiber " -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Anzeige " -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Mіchten Sie eine automatische Suche durchfќhren?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Aktion \"Rechtsklick\" zuweisen" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Sie mќssen der Aktion \"Rechtsklick\" eine Taste zuweisen, um dieses Spiel " "spielen zu kіnnen." -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Aktion \"Werkzeugleiste verbergen\" zuweisen" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Sie mќssen der Aktion \"Werkzeugleiste verbergen\" eine Taste zuweisen, um " "dieses Spiel spielen zu kіnnen." -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Aktion \"Herauszoomen\" zuweisen (optional)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Aktion \"Hineinzoomen\" zuweisen (optional)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Vergessen Sie nicht, der Aktion \"Werkzeugleiste verbergen\" eine Taste " "zuzuweisen, um das ganze Inventar sehen zu kіnnen." +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Lautstфrke" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Lautstфrke" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "%d neue Spiele gefunden." + +#~ msgid "Command line argument not processed" +#~ msgstr "Argument in Kommandozeile nicht verarbeitet" + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM-Towns-Emulator" + #~ msgid "Invalid Path" #~ msgstr "Ungќltiges Verzeichnis" diff --git a/po/es_ES.po b/po/es_ES.po index 837ac60911..b19a25a48f 100644 --- a/po/es_ES.po +++ b/po/es_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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-05-08 13:31+0100\n" "Last-Translator: Tomсs Maidagan\n" "Language-Team: \n" @@ -16,108 +16,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: Espanol\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(compilado el %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Caracterэsticas incluidas:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Motores disponibles:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Ir al directorio anterior" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Aceptar" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Cerrar" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Clic de ratѓn" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Mostrar el teclado" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Asignar teclas" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Elige la acciѓn a asociar" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Asignar" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "Aceptar" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Selecciona una acciѓn y pulsa \"Asignar\"" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tecla asociada: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tecla asociada: ninguna" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Por favor, selecciona una acciѓn" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Pulsa la tecla a asignar" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Juego" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -125,29 +125,29 @@ msgstr "" "Identificador usado para las partidas guardadas y para ejecutar el juego " "desde la lэnea de comando" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nombre:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Tэtulo completo del juego" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nom.:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Idioma:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -155,282 +155,282 @@ msgstr "" "Idioma del juego. No sirve para pasar al inglщs la versiѓn espaёola de un " "juego" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<por defecto>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plataforma:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plataforma para la que se diseёѓ el juego" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Plat.:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Ignorar opciones grсficas generales" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Opciones grсficas especэficas" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Sonido" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Ignorar opciones de sonido generales" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Opciones de sonido especэficas" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Ignorar opciones de volumen generales" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Opciones de volumen especэficas" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Ignorar opciones de MIDI generales" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Opciones de MIDI especэficas" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Ignorar opciones de MT-32 generales" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Opciones de MT-32 especэficas" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Especifica un directorio para datos adicionales del juego" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Partidas:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Especifica dѓnde guardar tus partidas" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Partidas:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Ninguna" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Por defecto" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Selecciona un SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Selecciona el directorio del juego" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Selecciona el directorio adicional" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Selecciona el directorio para partidas guardadas" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~S~alir" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Cerrar ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "Acerca ~d~e" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Acerca de ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~pciones..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Cambiar opciones generales de ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~J~ugar" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Jugar al juego seleccionado" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~C~argar..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Cargar partida del juego seleccionado" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~A~ёadir juego..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Mantener pulsado Mayњs para aёadir varios juegos" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~E~ditar juego..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Cambiar opciones de juego" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "E~l~iminar juego" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~ёadir..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~ditar..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "E~l~iminar" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Buscar en la lista de juegos" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Buscar:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Eliminar valor" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Cargar juego:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Cargar" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -438,208 +438,225 @@ msgstr "" "ПSeguro que quieres ejecutar la detecciѓn masiva? Puede que se aёada un gran " "nњmero de juegos." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sэ" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "No" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ЁScummVM no ha podido abrir el directorio!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Elige el juego:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "ПSeguro que quieres eliminar la configuraciѓn de este juego?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 msgid "This game does not support loading games from the launcher." msgstr "Este juego no permite cargar partidas desde el lanzador." -#: gui/launcher.cpp:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Aёad. varios" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Aёadir varios..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Aёadir..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Aёadir juego..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... progreso..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "ЁBњsqueda completada!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Se han encontrado %d juegos nuevos." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Se ha buscado en %d directorios..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Se han encontrado %d juegos nuevos..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "cada 5 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "cada 10 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "cada 15 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "cada 30 minutos" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Ninguno" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Renderizado:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Modos especiales de expansiѓn soportados por algunos juegos" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Correcciѓn de aspecto" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregir relaciѓn de aspecto en juegos 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "Difuminado EGA" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Activar difuminado en los juegos EGA compatibles" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Disp. preferido:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 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:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 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:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Emul. de AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib se usa para la mњsica en muchos juegos" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Frec. de salida:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -647,64 +664,64 @@ msgstr "" "Los valores mсs altos ofrecen mayor calidad, pero puede que tu tarjeta de " "sonido no sea compatible" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Especifica el dispositivo de salida General MIDI por defecto" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "No usar mњsica General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Utilizar el primer dispositivo disponible" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Ganancia MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Disp. MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -712,191 +729,192 @@ msgstr "" "Marcar si se quiere usar un dispositivo de sonido real conectado al " "ordenador y compatible con Roland" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sin emulaciѓn GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Activar modo Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "No usar mњsica Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Voces" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Vel. de subtэtulos:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Reproducir voces y subtэtulos" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vel. de subt.:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Silenciar" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volumen de los efectos de sonido" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Interfaz:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Idioma:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfaz de ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Tienes que reiniciar ScummVM para aplicar los cambios." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Selecciona el directorio de guardado" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Selecciona el directorio de temas" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Selecciona el directorio adicional" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Selecciona el directorio de plugins" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -904,779 +922,804 @@ msgstr "" "El tema seleccionado no es compatible con el idioma actual. Si quieres usar " "este tema debes cambiar a otro idioma primero." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "No hay fecha guardada" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "No hay hora guardada" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "No hay tiempo guardado" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Borrar" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "ПSeguro que quieres borrar esta partida?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Fecha: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Hora: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Tiempo: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Partida sin nombre" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Selecciona un tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX desactivados" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX desactivados" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Estсndar (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Estсndar (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Suavizado (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Suavizado (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "El motor no soporta el nivel de debug '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausar" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Saltar frase" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Error al ejecutar el juego:" -#: base/main.cpp:457 +#: base/main.cpp:456 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" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Ningњn error" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "No se han encontrado datos de juego" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "ID del juego no soportada" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Modo de color no soportado" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Permiso de lectura denegado" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Permiso de escritura denegado" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "La ruta no existe" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "La ruta no es un directorio" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "La ruta no es un archivo" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Imposible crear el archivo" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Fallo de lectura" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Fallo en la escritura de datos" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "No se ha encontrado un plugin adecuado" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "El plugin del motor no es compatible con partidas guardadas" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Argumento no vсlido de la lэnea de comando" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Error desconocido" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules verde" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules сmbar" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules verde" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules сmbar" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~R~eanudar" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~C~argar" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~G~uardar" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~pciones" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~A~yuda" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "Acerca ~d~e" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~V~olver al lanzador" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~V~olver al lanzador" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Guardar partida" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Guardar" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~S~э" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~C~ancelar" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~eclas" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~A~nterior" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "Si~g~uiente" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "Cerra~r~" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Comandos bсsicos de teclado:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Pantalla de Guardar / Cargar" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Saltar frase" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Saltar escena" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Espacio" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pausar el juego" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Cargar partida 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Guardar partida 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Salir" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Activar pantalla completa" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Subir / Bajar el volumen de la mњsica" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Aumentar / Disminuir la vel. de texto" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simular botѓn izquierdo del ratѓn" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simular botѓn derecho del ratѓn" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Comandos especiales de teclado:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Mostrar / Ocultar consola" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Iniciar debugger" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Mostrar consumo de memoria" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Ejecutar en modo rсpido (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Ejecutar en modo muy rсpido (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Captura de ratѓn" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Alternar entre filtros grсficos" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Aumentar / Disminuir factor de escalado" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Correcciѓn de aspecto" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* No se recomienda utilizar" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-f y ctrl-g, ya que pueden" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " provocar cuelgues o un" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " funcionamiento incorrecto del juego" -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Tejer hechizos con el teclado:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Controles bсsicos:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Empujar" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Tirar" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Dar" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Abrir" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Ir a" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Coger" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Usar" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Leer" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Cambiar personaje" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Encender" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Apagar" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Ir a" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Recoger" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Quщ es" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Abrir con llave" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Ponerse" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Quitarse" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Arreglar" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Cambiar" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Mirar" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Hablar" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Viajar" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Henry / Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "Tocar C menor con el bastѓn" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "Tocar D con el bastѓn" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "Tocar E con el bastѓn" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "Tocar F con el bastѓn" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "Tocar G con el bastѓn" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "Tocar A con el bastѓn" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "Tocar B con el bastѓn" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "Tocar C mayor con el bastѓn" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Empujar" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Tirar" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Hablar con" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Mirar" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Encender" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Apagar" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Arriba" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Seleccionar diсlogo anterior" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Abajo" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Seleccionar diсlogo siguiente" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Caminar" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventario" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objeto" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Blanco y negro / Color" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Ojos" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Lengua" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Puёetazo" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Patada" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Examinar" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Cursor normal" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Guardar / Cargar / Opciones" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Otros controles:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventario:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Subir" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Bajar" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Objeto superior izquierdo" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Objeto inferior izquierdo" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Objeto superior derecho" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Objeto inferior derecho" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Objeto izquierdo del medio" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Objeto derecho del medio" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Cambiar personaje:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Segundo chaval" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Tercer chaval" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Controles de lucha (tecl. num.)" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Retroceder" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Bloqueo alto" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Bloqueo medio" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Bloqueo bajo" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Puёetazo alto" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Puёetazo medio" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Puёetazo bajo" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Vсlidos cuando Indy estс a la izquierda." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Cuando Indy estс a la derecha," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4 y 1 se cambian por" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 y 3, respectivamente." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Controles del biplano (tecl. num.)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Volar arriba y a la izquierda" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Volar a la izquierda" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Volar abajo y a la izquierda" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Volar arriba" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Volar recto" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Volar abajo" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Volar arriba y a la derecha" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Volar a la derecha" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Volar abajo y a la derecha" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1687,7 +1730,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1698,7 +1741,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1709,7 +1752,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1719,266 +1762,325 @@ msgstr "" "permite. Para jugar, ve a 'Aёadir juego' en el menњ de inicio de ScummVM y " "selecciona el directorio 'Maniac', dentro del directorio de DOTT." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Modo ~Z~ip activado" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "Tra~n~siciones activadas" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "Efecto ag~u~a activado" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Cargar partida:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Cargar" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulador OPL de MAME" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Emulador OPL de DOSBox" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Sin mњsica" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Emulador de Amiga Audio" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Emulador de AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Emulador de Apple II GS (NO IMPLEMENTADO)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Emulador de C64 Audio" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Iniciando emulador de MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Emulador del altavoz de PC" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Emulador de IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Emulador de FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Asignaciѓn de teclas:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr "(Activa)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr "(General)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr "(Juego)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Menњ principal de ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Modo para ~z~urdos" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Controles para pelear de ~I~ndy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Mostrar el cursor" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Pegar a los bordes" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Compensaciѓn X del toque" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Compensaciѓn Y del toque" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Activar el sistema de control tipo trackpad de los portсtiles" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Un toque para clic izquierdo, dos para clic derecho" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Sensibilidad" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Escalado inicial de la pantalla superior:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Escalado de la pantalla principal:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Escalado por hardware (rсpido, pero de baja calidad)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Escalado por software (buena calidad, pero mсs lento)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Sin escalado (debes desplazar la pantalla a los lados)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Brillo:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Sonido de alta calidad (mсs lento) (reinicio)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Desactivar apagado" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Modo Touchpad activado." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Modo Touchpad desactivado." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (sin reescalado)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Correcciѓn de aspecto" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Correcciѓn de aspecto" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Alternar entre filtros grсficos" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Renderizado:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Conservar" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Modo de vэdeo actual:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Arriba" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Abajo" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Izquierda" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Derecha" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Clic izquierdo" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Clic derecho" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zona" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multifunciѓn" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Cambiar personaje" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Saltar texto" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Modo rсpido" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Menњ general" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Teclado virtual" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Asignaciѓn de teclas" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "ПQuieres salir?" @@ -2099,134 +2201,191 @@ msgid "Network down" msgstr "Red desconectada" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Inicializando red" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Se ha excedido el tiempo de inicializaciѓn de red" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Red no inicializada (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Ocultar barra de tareas" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Mostrar teclado" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Sonido activado/desactivado" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Clic derecho" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Mostrar/Ocultar cursor" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Vista libre" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Aumentar zoom" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Disminuir zoom" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Asignar teclas" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Arriba" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Abajo" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Izquierda" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Derecha" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "ПQuieres cargar o guardar el juego?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr "ПSeguro que quieres salir?" -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Teclado" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Rotar" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Usando driver SDL" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Pantalla" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "ПQuieres realizar una bњsqueda automсtica?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Asignar acciѓn 'Clic derecho'" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Debes asignar una tecla a la acciѓn 'Clic derecho' para jugar a este juego" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Asignar acciѓn 'Ocultar barra de tareas'" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Debes asignar una tecla a la acciѓn 'Ocultar barra de tareas' para jugar a " "este juego" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Asignar acciѓn 'Zoom' (opcional)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Asignar acciѓn 'Disminuir zoom' (opcional)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "No olvides asignar una tecla a la acciѓn 'Ocultar barra de tareas' para ver " "todo el inventario" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volumen" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volumen" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Se han encontrado %d juegos nuevos." + +#~ msgid "Command line argument not processed" +#~ msgstr "Argumento no vсlido de la lэnea de comando" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Emulador de FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Ruta no vсlida" diff --git a/po/fr_FR.po b/po/fr_FR.po index e73d2c8345..a1274a2cf9 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-05-02 19:50+0100\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <scummvm-devel@lists.sf.net>\n" @@ -17,108 +17,108 @@ msgstr "" "Language: Francais\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(compilщ sur %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Options incluses:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Moteurs disponibles:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Remonter" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Remonte d'un niveau dans la hiщrarchie de rщpertoire" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Remonter" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Annuler" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Choisir" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Fermer" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Clic de souris" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Afficher le clavier" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Changer l'affectation des touches" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Sщlectionnez une action р affecter" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Affecter" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Selectionez une action et cliquez 'Affecter'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Touche associщe: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Touche associщe: aucune" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Selectionnez une action" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Appuyez sur la touche р associer" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Jeu" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -126,29 +126,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:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Nom complet du jeu" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Langue:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -156,283 +156,283 @@ msgstr "" "Langue du jeu. Cela ne traduira pas en anglais par magie votre version " "espagnole du jeu." -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<defaut>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plateforme:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plateforme pour laquelle votre jeu a щtщ conчu" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Systшme:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Graphique" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Utiliser des rщglages graphiques spщcifiques р ce jeux" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Audio" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Utiliser des rщglages audio spщcifiques р ce jeux" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Utiliser des rщglages de volume sonore spщcifiques р ce jeux" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Utiliser des rщglages MIDI spщcifiques р ce jeux" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Utiliser des rщglages MT-32 spщcifiques р ce jeux" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Chemin du Jeu:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Chemin du Jeu:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Extra:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 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:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Sauvegardes:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Sauvegardes:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Aucun" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Dщfaut" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Choisir une banque de sons" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Sщlectionner le rщpertoire contenant les donnщes du jeu" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Sщlectionner un rщpertoire supplщmentaire" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~Q~uitter" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Quitter ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "Р ~P~ropos..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Р propos de ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~ptions..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Change les options globales de ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~D~щmarrer" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Dщmarre le jeu sщlectionnщ" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~C~harger" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Charge une sauvegarde pour le jeu sщlectionnщ" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~A~jouter..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "" "Ajoute un jeu р la Liste. Maintenez Shift enfoncщe pour un Ajout Massif" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~E~diter..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Change les options du jeu" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~S~upprimer" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~jouter..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~diter..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~S~upprimer" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Recherche dans la liste de jeux" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Filtre:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Effacer la valeur" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Charger le jeu:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Charger" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -440,207 +440,224 @@ msgstr "" "Voulez-vous vraiment lancer la dщtection automatique des jeux? Cela peut " "potentiellement ajouter un grand nombre de jeux." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Oui" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Non" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM n'a pas pu ouvrir le rщpertoire sщlectionnщ." -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Choisissez le jeu:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Voulez-vous vraiment supprimer ce jeu?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Ajout Massif..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Ajout Massif..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Ajouter..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Ajouter..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... en cours ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Examen terminщ!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "%d nouveaux jeux trouvщs." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "%d rщpertoires examinщs ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d nouveaux jeux trouvщs ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Jamais" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "Toutes les 5 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "Toutes les 10 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "Toutes les 15 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "Toutes les 30 mins" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Aucune" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Mode graphique:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Mode de rendu:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Mode spщcial de tramage supportщ par certains jeux" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Plein щcran" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Correction du rapport d'aspect" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrige le rapport d'aspect pour les jeu 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "Dщtramage EGA" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Active le dщtramage dans les jeux EGA qui le supporte" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 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:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 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:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Щmulateur AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Frщquence:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -648,64 +665,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:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Sortie GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 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:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Ne pas utiliser la musique General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Utiliser le premier pщriphщrique disponible" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "Banque de sons:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Mode mixe AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Utiliser р la fois MIDI et AdLib" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Gain MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Sortie MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -713,195 +730,196 @@ msgstr "" "Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland " "connectщ р l'ordinateur" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 exacte (pas d'щmu GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Activer le mode Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Ne pas utiliser la musique Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Voix" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Sous-titres" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Les deux" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Voix" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Affiche les sous-titres et joue les dialogues audio" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Volume Musique:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Musique:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Silence" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Volume Bruitage:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volume des effets spщciaux sonores" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Bruitage:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Volume Dialogues:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Dialogues:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Thшme:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Interface:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Sauvegarde auto:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Sauvegarde:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Touches" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Langue:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Langue de l'interface graphique de ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Sщlectionner le rщpertoire des thшmes d'interface" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Sщlectionner le rщpertoire pour les fichiers suplщmentaires" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Sщlectionner le rщpertoire des plugins" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -909,779 +927,804 @@ msgstr "" "Le thшme que vous avez sщlectionщ ne support pas la langue franчaise. Si " "vous voulez l'utiliser vous devez d'abord changer de langue." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Date inconnue" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Heure inconnue" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Durщe de jeu inconnue" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Supprimer" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Voulez-vous vraiment supprimer cette sauvegarde?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Date: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Heure: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Durщe de jeu: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Sauvegarde sans nom" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Sщlectionnez un Thшme" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX dщsactivщ" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX dщsactivщ" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Rendu Standard (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Rendu Anti-crщnelщ (16 bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Anti-crщnelщ (16 bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, 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:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menu" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Mettre en pause" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Passer la phrase" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Erreur lors de l'щxщcution du jeu:" -#: base/main.cpp:457 +#: base/main.cpp:456 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щ" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Pas d'erreur" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Fichier de donщes introuvable" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "ID de jeu non supportщ" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Mode de couleurs non supportщ" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Vщroulliщ en lecture" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Verrouillщ en щcriture" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Chemin inexistant" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Chemin n'est pas un rщpertoire" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Chemin n'est pas un fichier" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Impossible de crщer le fichier" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Echec de la lecture" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Echec de l'щcriture des donnщes" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Aucun plugin n'a pu ъtre trouvщ pour ce jeu" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Ce moteur de jeu ne supporte pas les sauvegardes" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Argument de ligne de commande non traitщ" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Erreur inconnue" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Vert" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Ambre" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Vert" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Ambre" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~R~eprendre" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~C~harger" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~S~auver" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~ptions" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~A~ide" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "Р ~P~ropos" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "Retour au ~L~anceur" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "Retour au ~L~anceur" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Sauvegarde:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Sauver" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~A~nnuler" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~ouches" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~rщcщdent" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~S~uivant" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~F~ermer" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Commandes clavier communes:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Dialogue de Sauvegarde/Chargement" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Passer la phrase" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Passer la sщquence" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Espace" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Mettre en pause:" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Charger sauvegarde 1-10:" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Щcrire sauvegarde 1-10:" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Quitter" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Entrer" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Basculer en plein щcran" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Augmenter / Diminuer volume musique" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Diminuer/Augmenter vitesse du texte" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simuler bouton gauche de la souris" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simuler bouton droit de la souris" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Commandes clavier spщciales:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Afficher/Cacher la console" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Ouvrir le dщbugger" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Afficher la consomation de mщmoire" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Jouer en mode rapide (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Jouer en mode trшs rapide (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Capturer/Libщrer la souris" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Changer de filtre graphique" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Augmenter/Diminuer le facteur d'щchelle" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Changer correction du rapport d'aspect" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Note que l'utilisation de crtl-f et" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " crtl-g n'est pas recommandщ car" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " elle peut causer des plantages ou" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " un comportement incorrect du jeu" -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Filage au clavier:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Controles principaux du jeu:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Pousser" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Tirer" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Donner" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Ouvrir" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Aller" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Prendre" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Utiliser" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Lire" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Changer" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Allumer" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Щteindre" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Aller" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Prendre" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Qu'est-ce" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Dщverrouiller" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Mettre" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Enlever" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Rщparer" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Commuter" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Regarder" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Parler" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Voyager" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Henry / Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "jouer Do mineur sur la quenouille" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "jouer Rщ sur la quenouille" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "jouer Mi sur la quenouille" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "jouer Fa sur la quenouille" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "jouer Sol sur la quenouille" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "jouer La sur la quenouille" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "jouer Si sur la quenouille" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "jouer Do Majeur sur la quenouille" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Pousser" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Tirer" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Parler р" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Regarder" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Allumer" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Щteindre" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Touche Haut" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Sщlectionner le dialogue prщcщdent" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Touche Bas" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Sщlectionner le dialogue suivant" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Marcher" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventaire" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objet" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Noir et Blanc / Couleur" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Yeux" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Langue" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Frapper" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Coup de pied" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Examiner" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Curseur normal" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Sauvegarder / Charger / Options" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Autres controles du jeu:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventaires:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Faire dщfiler vers le haut" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Faire dщfiler vers le bas" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Щlщment en haut р gauche" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Щlщment en bas р gauche" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Щlщment en haut р droite" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Щlщment en bas р droite" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Щlщment au milieu р gauche" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Щlщment au milieu р droite" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Changer de personnage" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Second enfant" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Troisiшme enfant" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Controles de combat (pavet numщrique):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Pas en arriшre" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Bloquer haut" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Bloquer milieu" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Bloquer bas" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Fraper haut" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Frapper milieu" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Frapper bas" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Correct quand Indy est р gauche." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Quand Indy est р droite, 7, 4 et 1" -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "sont interverties avec 9, 6 et 3" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "respectivement." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Controles du biplane (paver numщrique):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Voler vers le haut р gauche" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Voler vers la gauche" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Voler vers le bas р gauche" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Voler vers le haut" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Voler tout droit" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Voler vers le bas" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Voler vers le haut р droite" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Voler vers la droite" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Voler vers la bas р droite" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1692,7 +1735,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1703,7 +1746,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1714,7 +1757,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1725,266 +1768,325 @@ msgstr "" "choisissez 'Ajouter...' dans le Lanceur de ScummVM et sщlectionnez le " "rщpertoire 'Maniac Mansion' dans le rщpertoire du jeu Day Of The Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Mode ~Z~ip Activщ" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "T~r~ansitions activщ" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~E~ffets de l'Eau Activщs" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Charger le jeu:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Charger" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Щmulateur MAME OPL" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Щmulateur DOSBox OPL" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Pas de musique" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Щmulateur Amiga Audio" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Щmulateur AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Щmulateur Apple II GS (PAS IMPLЩMENTЩ)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Щmulateur C64 Audio" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Initialisation de l'Щmulateur MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Щmulateur MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Щmulateur Haut Parleur PC" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Щmulateur IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Щmulateur FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Affectation des touches:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr "(Actif)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr "(Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr "(Jeu)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "MIDI Windows" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Menu Principal ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Mode ~G~aucher" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Contrєle des combats d'~I~ndy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Afficher le curseur de la souris" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Aligner sur les bords" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Dщcalage X du toucher" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Dщcallage Y du toucher" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Activer le contrєle du curseur de type trackpad" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Toucher pour un clic gauche, toucher deux fois pour un clic droit" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Sensibilitщ" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Щchelle initiale de l'щcran du haut" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Щchelle de l'щcran principal" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Mise р l'echelle matщrielle (rapide mais qualitщ faible)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Mise р l'щchelle logicielle (bonne qualitщ mais plus lent)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Sans changement d'щchelle (vous devez faire dщfiler l'щcran)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Luminositщ:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Audio haute qualitщ (plus lent) (redщmarrer)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Dщsactivщ l'extinction" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Mode touchpad activщ" -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Mode touchpad dщsactivщ" -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (щchelle d'origine)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Changer correction du rapport d'aspect" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Changer correction du rapport d'aspect" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Changer de filtre graphique" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Mode de rendu:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Prщserve" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Originel" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Mode vidщo actuel" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Haut" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Bas" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Gauche" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Droite" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Clic Gauche" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Clic Droit" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zone" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Fonction Multiple" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Changement de personnage" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Sauter le texte" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Mode rapide" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Menu global" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Clavier virtuel" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Affectation des touches" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Voulez-vous quitter?" @@ -2105,135 +2207,192 @@ msgid "Network down" msgstr "Rщseau dщconnectщ" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Initialisation du rщseau" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Dщpassement du dщlai lors de l'initialisation du rщseau" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Rщseau non initialisщ (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Cachщ la barre d'outils" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Afficher le clavier" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Audio marche/arrъt" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Clic droit" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Afficher/Cacher le curseur" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Regarder autour" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Dщzoomer" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Zoomer" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Affecter les touches" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Haut" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Bas" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Gauche" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Droit" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Voulez-vous charger ou enregistrer le jeu?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr "Voulez-vous vraiment quitter?" -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Clavier" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Pivoter" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Utilise le pilote SDL" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Affichage" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Voulez-vous exщcuter une recherche automatique?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Affecter l'action 'Clic Droit'" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Vous devez affecter une touche р l'action de 'Clic Droit' pour pouvoir jouer " "р ce jeu" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Affecter l'action 'Cacher Bar d'Outils'" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Vous devez affecter une touche р l'action 'Cacher Bar d'Outils' pour pouvoir " "jouer р ce jeu" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Affecter l'action 'Dщzoomer' (optionnelle)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Affecter l'action 'Zoomer' (optionnelle)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Noubliez pas d'affecter une touche р l'action 'Cacher Bar d'Outils' pour " "pouvoir voir entiшrement l'inventaire" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volume" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volume" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "%d nouveaux jeux trouvщs." + +#~ msgid "Command line argument not processed" +#~ msgstr "Argument de ligne de commande non traitщ" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Щmulateur FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Chemin Invalide" diff --git a/po/hu_HU.po b/po/hu_HU.po index 2a2256b7a1..d3ee99d0fc 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-04-22 19:33+0100\n" -"PO-Revision-Date: 2011-04-23 15:38+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"PO-Revision-Date: 2011-06-12 07:17+0100\n" "Last-Translator: Gruby <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -20,419 +20,419 @@ msgstr "" "X-Poedit-Country: HUNGARY\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(kщszќlt %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Lefordэtott іsszetevѕk:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Tсmogatott jсtщkmotorok:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Feljebb" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Vissza az elѕzѕ kіnyvtсrszintre" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Feljebb" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Mщgse" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vсlaszt" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Bezсr" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Egщrkattintсs" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Billentyћzet beсllэtсsok" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Billentyћk сtсllэtсsa" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Vсlassz mћveletet a kiosztсshoz" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Kiosztсs" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Vсlassz mћveletet щs katt a 'Kiosztсs'-ra" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tсrsэtott billentyћ: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tсrsэtott billentyћ: nincs" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Vсlassz egy mћveletet" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Nyomj egy billentyћt a tсrsэtсshoz" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Jсtщk" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 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:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nщv:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "A jсtщk teljes neve" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nщv:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Nyelv:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 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 Angolra nyelvre" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<alapщrtelmezett>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Platform amire a jсtщkot eredetileg kщszэtettщk" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Audiѓ" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Globсlis MT-32 beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 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:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 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:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Mentщs Mappa:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Mentщs Mappa:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Nincs" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Alapщrtelmezett" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "SoundFont kivсlasztсs" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Jсtщkok helyщnek kivсlasztсsa" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Vсlassz mappсt a jсtщk kiegщszэtѕkhіz" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Vсlaszz jсtщkmentщseknek mappсt" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "Kilщpщs" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "ScummVM bezсrсsa" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "Nщvjegy" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "ScummVM nщvjegy" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~pciѓk..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Globсlis ScummVM opciѓk cserщje" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "Indэtсs" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "A vсlasztott jсtщk indэtсsa" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "Betіltщs" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Kimentett jсtщkсllсs betіltщse" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "Jсtщk hozzсadсs" -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Tratsd lenyomva a Shift-et a Masszэv mѓdhoz" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "Jсtщkopciѓk" -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Jсtщk beсllэtсsok megvсltoztatсsa" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "Jсtщk tіrlщse" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "Jсtщk hozzсadсs" -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Jсtщkopciѓk" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "Jсtщk tіrlщse" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Keresщs a jсtщklistсban" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Keresщs:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Щrtщk tіrlщse" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Jсtщk betіltщse:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Betіltщs" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -440,266 +440,283 @@ 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:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Igen" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nem" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nem tudja megnyitni a vсlasztott mappсt!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Vсlassztott jсtщk:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 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:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Masszэv mѓd..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Masszэv mѓd..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Jсtщk hozzсadсs" -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Jсtщk hozzсadсs" -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... folyamatban ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Vizsgсlat kщsz!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "%d кj jсtщkot talсltam." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "%d њj jсtщkot talсltam, %d elѕzѕleg hozzсadott jсtщk kihagyva..." -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "%d Mappa сtvizsgсlva..." -#: gui/massadd.cpp:254 +#: gui/massadd.cpp:253 #, c-format -msgid "Discovered %d new games ..." -msgstr "%d кj jсtщkot talсltam." +msgid "Discovered %d new games, ignored %d previously added games ..." +msgstr "%d њj jсtщkot talсltam, %d elѕzѕleg hozzсadott jсtщk kihagyva..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Soha" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "5 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "10 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "15 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "30 percenkщnt" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Nincs" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "a videѓmѓd nem vсltozott." + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott" + +#: gui/options.cpp:396 +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:705 msgid "Graphics mode:" msgstr "Grafikus mѓd:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Kirajzolсs mѓd:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 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:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Teljeskщpernyѕs mѓd:" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Kщpmщretarсny korrekciѓ" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA szinjavэtсs" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "EGA szэnjavэtсs tсmogatott EGA jсtщkokban" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Elsѕdleges eszkіz:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 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:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Elsѕdleges eszk.:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Kimeneti rсta:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 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:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "GM Eszkіz:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Ne hasznсlj General MIDI zenщt" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Vegyes AdLib/MIDI mѓd" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "MIDI erѕsэtщs:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "MT-32 Eszkіz:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -707,190 +724,190 @@ msgstr "" "Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a " "gщpedhez щs hasznсlni akarod" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Roland GS Mѓd engedщlyezve" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Ne hasznсlj Roland MT-32 zenщt" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Szіveg щs beszщd:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Csak beszщd" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Csak felirat" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Mind" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Felirat щs beszщd:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Besz" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Text" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Mind" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Hang щs feliratok megjelenэtщse" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "жsszes nщmэtсsa" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Speciсlis hangeffektusok hangereje" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tщma:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI Renderelѕ:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Billentyћk" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "GUI nyelve:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "A ScummVM GUI nyelve" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Vсlassz jсtщkmentщs mappсt" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "GUI tщma mappa kivсlasztсsa" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Mappa vсlasztсs az extra fсjloknak" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Plugin mappa kivсlasztсsa" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -898,779 +915,803 @@ msgstr "" "A kivсlasztott tщma nem tсmogatja a nyelvedet. Ha hasznсlni akarod ezt a " "tщmсt, elѕszѕr vсlts сt egy mсsik nyelvre." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Dсtum nincs mentve" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Idѕ nincs mentve" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Jсtщkidѕ nincs mentve" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Tіrіl" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Biztos hogy tіrіlni akarod ezt a jсtщkсllсst?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Dсtum:" -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Idѕ:" -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Jсtщkidѕ:" -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Nщvtelen jсtщkсllсs" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Vсlassz tщmсt" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX letiltva" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX letiltva" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standard lekщpezѕ (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Щlsimэtсsos lekщpezѕ (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Щlsimэtott (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "A motor nem tсmogatja a '%s' debug szintet" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menќ" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Szќnet" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Sor сtlщpщse" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Hiba a jсtщk futtatсsakor:" -#: base/main.cpp:457 +#: base/main.cpp:456 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" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Nincs hiba" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Jсtщk adat nem talсlhatѓ" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Jсtщk id nem tсmogatott" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Nem tсmogatott szэnmѓd" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Olvasсs hozzсfсrщs megtagadva" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Эrсs hozzсfщrщs megtagadva" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Mappa nem lщtezik" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Mappa nem egy kіnyvtсr" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Mappa nem egy fсjl" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Fсjl nem hozhatѓ lщtre" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "A Beolvasott adat hibсs" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Kiэrt adat hibсs" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Nem talсlhatѓ alkalmas motor plugin" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "A motor nem tсmogatja a jсtщkсllсs mentщsщt" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Parancssori paramщter nem mћkіdik" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Ismeretlen hiba" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Zіld" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Sсrga" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Zіld" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Sсrga" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "A '%s' jсtщk ismeretlennek tћnik." + +#: engines/advancedDetector.cpp:369 +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:371 +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.:" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "A felismert jсtщkverziѓd a hasznсlt fсjlnщvvel a %s egy vсltozata." + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "Ha ez egy eredeti nem vсltoztatott verziѓ, kщrlek jelezd minden" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "elѕzѕleg kiэrt informсciѓt a ScummVM csapatnak." + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "Folytatсs" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "Betіltщs" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "Mentщs" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~pciѓk" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "Sњgѓ" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "Nщvjegy" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "Visszatщrщs az indэtѓba" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "Visszatщrщs az indэtѓba" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Jсtщk mentщse:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Mentщs" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "Mщgse" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "Billentyќk" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "Elѕzѕ" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "Kіvetkezѕ" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "Bezсr" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Сltalсnos billentyћparancsok:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Ment / Tіlt dialѓgus" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Szіvegsor сtugrсsa" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Bevezetѕ сtugrсsa" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Szѓkіz" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Szќnet a jсtщkban" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "1-10 Jсtщkсllсs betіltщse" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "1-10 Jсtщkсllсs mentщse" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Kilщpщs" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Teljeskщpernyѕ kapcsolѓ" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Zene hangerѕ fel / le" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Szіvegsebessщg gyors / lassњ" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Bal egщrgomb szimulсciѓ" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Jobb egщrgomb szimulсciѓ" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Speciсlis billentyћparancsok:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Konzol be / ki kapcsolсs" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Hibakeresѕ indэtсsa" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Memѓriakihasznсltsсg lсtszik" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Futtatсs gyors mѓdban (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Futtatсs tњlgyors mѓdban (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Egщr rіgzэtщs kapcsolѓ" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Kapcsolсs grafikus szћrѕk kіzіtt" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Lщptщk nіvelщs / csіkkentщs" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Mщretarсny korrekciѓ kapcsolѓ" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Megjegyzщs, ctrl-f щs" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g hasznсlata nem javasolt" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " mert rendszerіsszeomlсst vagy" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." -msgstr " hibсs mћkіdщst eredmщnyezhet." +#: engines/scumm/help.cpp:110 +msgid " or incorrect game behavior." +msgstr " vagy hibсs jсtщkmћkіdщst okoz." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Forgѓ draftok a billentyћzeten:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Fѕ jсtщkvezщrlѕk:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Tol" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Hњz" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Ad" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Nyit" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Menj" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Vesz" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Hasznсl" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Olvas" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "кj gyerek" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Bekapcsol" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Kikapcsol" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Odamegy" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Felvesz" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Mi ez" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Felold" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Felvesz" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Letesz" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Javэt" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Kapcsol" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Megnщz" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Beszщl" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Utazсs" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Henrytѕl / Indytѕl" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "C moll jсtщk a bottal" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "Jсtщk D-ben a bottal" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "Jсtщk E-ben a bottal" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "Jсtщk F-ben a bottal" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "Jсtщk G-ben a bottal" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "Jсtщk A-ban a bottal" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "Jсtщk B-ben a bottal" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "C dњr jсtщk a bottal" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Megtol" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "hњz (Rсnt)" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Beszщl" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Megnщzi" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Bekapcsol" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Kikapcsol" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "FelGomb" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Elѕzѕ dialѓgus kiemelщse" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "LeGomb" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Kіvetkezѕ dialѓgus kiemelщse" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Megy" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Tсrgylista" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Tсrgy" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Fekete fehщr / Szэnes" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Szemek" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Nyelv" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Megќt" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Megќt" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Vizsgсl" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Szabvсny kurzor" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Ment / Tіlt / Opciѓk" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Egyщbb jсtщkvezщrlѕk:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Tсrgylista:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Listagіrgetщs fel" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Listagіrgetщs le" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Bal felsѕ tсrgy" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Bal alsѓ tсrgy" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Jobb felsѕ tсrgy" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Jobb alsѓ tсrgy" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Bal kіzщpsѕ tсrgy" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Jobb kіzщpsѕ tсrgy" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Karakterek cserщje:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Mсsodik gyerek" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Harmadik gyerek" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Verekedщs irсnyэtѓk (numpad):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Hсtralщp" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Felsѕ vщdщs" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Vщdщs kіzщpen" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Alsѓ vщdщs" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Felsѕ ќtщs" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "мtщs kіzщpen" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Alsѓ ќtщs" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Indytѕl balra levѕ." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Indytѕl jobbra levѕ," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4, щs 1 сtkapcsolva" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6, щs 3-ra, egyenkщnt." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Repќlѕ vezщrlѕk (numpad):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Balra fel repќlщs" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Balra repќlщs" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Balra le repќlщs" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Repќlщs fel" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Repќlщs elѕre" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Repќlщs le" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Jobbra fel repќlщs" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Jobbra repќlщs" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Jobbra le repќlщs" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1681,7 +1722,7 @@ msgstr "" "\n" "%s fсjlba nem sikerќlt" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1692,7 +1733,7 @@ msgstr "" "\n" "%s fсjlbѓl nem sikerќlt" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1703,7 +1744,7 @@ msgstr "" "\n" "%s fсjlba elkщszќlt" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1713,266 +1754,323 @@ msgstr "" "jсtszani akarsz vele menj a ScummVM fѕmenќben a 'Jсtщk hozzсadсs' ra щs " "vсlaszd a 'Maniac' mappсt a 'Tentacle' kіnyvtсrсban." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~Z~ip Mѓd aktivсlva" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "Сtmenetek engedщlyezve" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "Oldal~D~obсs" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "~S~ Tщrkщp" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "Vэzeffektus engedщlyezve" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Jсtщkmenet visszaсllэtсsa:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Visszaсllэtсs" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulсtor" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulсtor" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" +"A '%s' kivсlasztott hangeszkіz nem elщrhetѕ. Bѕvebb informсciѓ a " +"naplѓfсjlban. Kіvetkezѕ elщrhetѕ eszkіz keresщse..." + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" +"A '%s' elsѕdleges hangeszkіz nem elщrhetѕ. Bѕvebb informсciѓ a naplѓfсjlban. " +"Kіvetkezѕ elщrhetѕ eszkіz keresщse..." + +#: audio/null.h:43 msgid "No music" msgstr "Nincs zene" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Amiga Audiѓ Emulсtor" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib Emulсtor" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS Emulсtor (NEM TСMOGATOTT)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64 Audio Emulсtor" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" -msgstr "MT-32 Emulсtor inicializсlсs" +#: audio/softsynth/mt32.cpp:329 +msgid "Initializing MT-32 Emulator" +msgstr "MT-32 Emulсtor inicializсlсsa" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32 Emulсtor" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC Speaker Emulсtor" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM PCjr Emulсtor" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM Towns Emulсtor" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Billentyћzet kiosztсs:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Aktэv)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Globсlis)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Jсtщk)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "ScummVM Fѕmenќ" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Balkezes mѓd:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~I~ndy fight controls" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Egщrkurzor lсtszik" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Щlekre illesztщs" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Touch X Eltolсs" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Touch Y Eltolсs" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Laptop trackpad stэlusu kurzor vezщrlѕ" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Щrintщs balkatt, duplaщrintщs jobbkatt" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Щrzщkenysщg" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Kщpernyѕ felsѕ kezdѕpont:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Fѕkщpernyѕ сtmщretezщs:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Hardveres сtmщretezщs (gyors, alacsony minѕsщg)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Szoftveres сtmщretezщs (jѓ minѕsщg, lassњ)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Eredeti (gіrgethetsz jobbra щs balra)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Fщnyerѕ:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Jѓminѕsщgќ audiѓ (lassabb)(њjraindэtсs)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Leсllэtсs tiltva" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad mѓd engedщlyezve." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Touchpad mѓd letiltva." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normсl (nincs сtmщretezщs)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normсl (nincs сtmщretezщs)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +msgid "Enabled aspect ratio correction" +msgstr "Mщretarсny korrekciѓ engedщlyezve" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +msgid "Disabled aspect ratio correction" +msgstr "Mщretarсny korrekciѓ letiltva" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +msgid "Active graphics filter:" +msgstr "Aktэv grafikus szћrѕk:" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +msgid "Windowed mode" +msgstr "Ablakos mѓd" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normсl" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Megtartott" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Eredeti" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +msgid "Current display mode" +msgstr "Jelenlegi videѓmѓd" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "Aktuсlis mщretezщs" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "Aktэv filter mѓd: Lineсris" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "Aktэv filter mѓd: Kіzelэtѕ" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Fel" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Le" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Bal" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Jobb" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Bal katt" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Jobb katt" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zѓna" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Tіbbfunkciѓs" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Karakter csere" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Szіveg сtugrсsa" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Gyors mѓd" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Hibakeresѕ" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Globсlis menќ" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Virtuсlis billentyћzet" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Billentyћ kiosztсs" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Ki akarsz lщpni ?" @@ -2093,131 +2191,184 @@ msgid "Network down" msgstr "Nincs hсlѓzat" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" -msgstr "Hсlѓzat inicializсlсs" +msgid "Initializing network" +msgstr "Hсlѓzat inicializсlсsa" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" -msgstr "Idѕtњllщpщs a hсlѓzat inicializсlсsnсl" +msgid "Timeout while initializing network" +msgstr "Idѕtњllщpщs a hсlѓzat inicializсlсsakor" #: backends/platform/wii/options.cpp:186 #, c-format -msgid "Network not initialised (%d)" -msgstr "Hсlѓzat nincs inicializсlva (%d)" +msgid "Network not initialized (%d)" +msgstr "(%d) Hсlѓzat nincs inicializсlva" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Eszkіztсr rejtщs" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Billentyћzet megjelenэtщs" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Hang be/ki" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Jobb katt" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Kurzor be/ki" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Szabad nщzet" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Nagyэtсs" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Kicsinyэtщs" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Kapcsolѓdсs kulcsok" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Kurzor Fel" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Kurzor Le" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Kurzor Bal" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Kurzor Jobb" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Jсtщkсllсs betіltщse vagy mentщse?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Biztos hogy ki akarsz lщpni ? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Billentyћzet" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Forgatсs" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "SDL meghajtѓ hasznсlata" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Kijelzѕ" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "El akarod kezdeni az automatikus vizsgсlatot ?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Jobbkatt mћvelet gomb" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Vсlassz egy billentyћt a 'Jobbkatt' mћvelethez" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Eszkіztсr rejtщs gomb" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Vсlassz egy billentyћt az 'Eszkіztсr rejtщs' mћvelethez" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Nagyэtсs mћvelet (opcionсlis)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Kicsinyэtщs mћvelet (opcionсlis)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Ne felejts billentyћt tсrsэtani az 'Eszkіztсr rejtщs' mћvelethez, hogy lсsd " "a teljes listсt" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "Щrintѕkщpernyѕ 'Tap Mѓd' - Bal katt" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "Щrintѕkщpernyѕ 'Tap Mѓd' - Jobb katt" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "Щrintѕkщpernyѕ 'Tap Mѓd' - Lebegѕ (Nincs katt)" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +msgid "Maximum Volume" +msgstr "Maximum Hangerѕ" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "Hangerѕ nіvelщse" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +msgid "Minimal Volume" +msgstr "Minimum Hangerѕ" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "Hangerѕ csіkkentщse" + +#~ msgid "Discovered %d new games." +#~ msgstr "%d кj jсtщkot talсltam." + +#~ msgid "Command line argument not processed" +#~ msgstr "Parancssori paramщter nem mћkіdik" + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM Towns Emulсtor" + #~ msgid "Invalid Path" #~ msgstr "Щrvщnytelen mappa" diff --git a/po/it_IT.po b/po/it_IT.po index c8e9b8dc55..2d31e1ab6a 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-04-24 14:46+0100\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" @@ -16,108 +16,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: Italiano\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(build creata il %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Funzionalitр compilate in:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Motori disponibili:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Cartella superiore" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Vai alla cartella superiore" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Su" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Annulla" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Scegli" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Chiudi" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Clic del mouse" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Mostra tastiera" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Riprogramma tasti" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Scegli un'azione da mappare" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Mappa" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Seleziona un'azione e clicca 'Mappa'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tasto associato: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tasto associato: nessuno" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Seleziona un'azione" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Premi il tasto da associare" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Gioco" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -125,311 +125,311 @@ msgstr "" "Breve identificatore di gioco utilizzato per il riferimento a salvataggi e " "per l'esecuzione del gioco dalla riga di comando" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Titolo completo del gioco" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Lingua:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 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:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<predefinito>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Piattaforma:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "La piattaforma per la quale il gioco ш stato concepito" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Piattaf.:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafica" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "Grafica" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Audio" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Percorsi" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Perc." -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Percorso gioco:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Perc. gioco:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Percorso extra:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Specifica il percorso di ulteriori dati usati dal gioco" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Perc. extra:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Salvataggi:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Specifica dove archiviare i salvataggi" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Salvataggi:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Nessuno" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinito" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Seleziona SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Seleziona la cartella contenente i file di gioco" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Seleziona la cartella di gioco aggiuntiva" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Seleziona la cartella dei salvataggi" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "C~h~iudi" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Chiudi ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "~I~nfo..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Informazioni su ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~pzioni..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Modifica le opzioni globali di ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~G~ioca" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Esegue il gioco selezionato" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~C~arica..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Carica un salvataggio del gioco selezionato" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~A~ggiungi gioco..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Tieni premuto Shift per l'aggiunta in massa" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~M~odifica gioco..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Modifica le opzioni di gioco" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~R~imuovi gioco" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~gg. gioco..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~M~odif. gioco..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~R~im. gioco" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Cerca nella lista dei giochi" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Cerca:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Cancella" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Carica gioco:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Carica" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -437,210 +437,227 @@ msgstr "" "Vuoi davvero eseguire il rilevatore di giochi in massa? Potrebbe aggiungere " "un numero enorme di giochi." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sь" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "No" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM non ha potuto aprire la cartella specificata!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Scegli il gioco:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Sei sicuro di voler rimuovere questa configurazione di gioco?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Agg. massa..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Agg. in massa..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Agg. gioco..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Aggiungi gioco..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... progresso ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Scansione completa!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Rilevati %d nuovi giochi." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "%d cartelle analizzate..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Rilevati %d nuovi giochi..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Mai" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "ogni 5 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "ogni 10 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "ogni 15 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "ogni 30 minuti" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Nessuno" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Modalitр:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Resa grafica:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Modalitр a schermo intero" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Correzione proporzioni" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregge le proporzioni dei giochi 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "Undithering EGA" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Attiva undithering nei giochi EGA che lo supportano" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Disp. preferito:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Dispositivo audio:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Specifica il dispositivo audio o l'emulatore della scheda audio preferiti" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 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:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferito:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Disposit. audio:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Emulatore AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib ш utilizzato per la musica in molti giochi" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Frequenza:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -648,62 +665,62 @@ msgstr "" "Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non " "essere supportati dalla tua scheda audio" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Non utilizzare la musica General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Utilizza il primo dispositivo disponibile" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont ш supportato da alcune schede audio, Fluidsynth e Timidity" -#: gui/options.cpp:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Modalitр mista AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilizza generazione di suono sia MIDI che AdLib" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Guadagno MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -711,192 +728,193 @@ msgstr "" "Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland " "che ш connesso al tuo computer" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 effettivo (disat.emul.GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Attiva la modalitр Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Non utilizzare la musica Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Voci" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Sottotitoli" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Entrambi" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Voci" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Sub" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Entr." -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Mostra i sottotitoli e attiva le voci" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Disattiva audio" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volume degli effetti sonori" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Percorso tema:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Perc. tema:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Percorso plugin:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Perc. plugin:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Renderer GUI:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Tasti" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Lingua GUI:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Lingua dell'interfaccia grafica di ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Devi riavviare ScummVM affinchщ le modifiche abbiano effetto." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Seleziona la cartella per i salvataggi" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Seleziona la cartella dei temi dell'interfaccia" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Seleziona la cartella dei file aggiuntivi" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Seleziona la cartella dei plugin" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -904,780 +922,805 @@ msgstr "" "Il tema che hai selezionato non supporta la lingua attuale. Se vuoi " "utilizzare questo tema devi prima cambiare la lingua." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Nessuna data salvata" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Nessun orario salvato" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Nessun tempo salvato" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Elimina" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Sei sicuro di voler eliminare questo salvataggio?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Data: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Ora: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Tempo di gioco: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Salvataggio senza titolo" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Seleziona un tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Grafica disattivata" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Grafica disattivata" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Renderer standard (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Renderer con antialiasing (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Con antialiasing (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Il motore non supporta il livello di debug '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menu" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Salta battuta" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Errore nell'esecuzione del gioco:" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "" "Impossibile trovare un motore in grado di eseguire il gioco selezionato" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Nessun errore" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Dati di gioco non trovati" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "ID di gioco non supportato" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Modalitр colore non supportata" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Autorizzazione di lettura negata" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Autorizzazione di scrittura negata" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Il percorso non esiste" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Il percorso non ш una cartella" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Il percorso non ш un file" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Impossibile creare il file" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Lettura dei dati fallita" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Scrittura dati fallita" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Impossibile trovare un plugin idoneo" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Il plugin del motore non supporta i salvataggi" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Argomento della linea di comando non eseguito" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Errore sconosciuto" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules verde" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules ambra" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules verde" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ambra" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~R~ipristina" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~C~arica" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~S~alva" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~pzioni" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~A~iuto" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~I~nfo" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~T~orna a elenco giochi" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~V~ai a elenco giochi" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Salva gioco:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Salva" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~A~nnulla" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~asti" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~recedenti" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~S~uccessivi" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~C~hiudi" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Comandi da tastiera comuni:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Finestra di salvataggio / caricamento" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Salta battuta" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Salta scena di intermezzo" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Spazio" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Metti in pausa" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Carica salvataggio 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Salva nella posizione 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Esci" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Invio" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Attiva / disattiva schermo intero" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Volume musica su / giљ" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Testo piљ veloce / meno veloce" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simula clic sinistro del mouse" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simula clic destro del mouse" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Comandi da tastiera speciali:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Mostra/nascondi console" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Avvia il debugger" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Mostra consumo memoria" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Esegui in modalitр veloce (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Esegui in modalitр molto veloce (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Attiva / disattiva ancoraggio del mouse" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Cambia filtro grafico" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Aumenta / diminuisci dimensioni" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Cambia correzione proporzioni" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Nota che l'utilizzo di ctrl-f e" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g non ш consigliato perchщ" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " potrebbe causare blocchi o un" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " comportamento errato del gioco." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Tessere melodie da tastiera:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Controlli principali di gioco:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Premi" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Tira" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Dai" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Apri" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Vai verso" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Prendi" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Usa" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Leggi" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Cambia personaggio" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Accendi" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Spegni" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Cammina verso" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Raccogli" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Che cos'ш" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Apri" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Indossa" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Togli" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Ripara" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Sposta" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Guarda" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Parla" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Viaggio" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "A Henry / a Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "suona Do (C) minore sul bastone" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "suona Re (D) sul bastone" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "suona Mi (E) sul bastone" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "suona Fa (F) sul bastone" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "suona Sol (G) sul bastone" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "suona La (A) sul bastone" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "suona Si (B) sul bastone" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "suona Do (C) maggiore sul bastone" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Premi" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Tira" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Parla con" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Esamina" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Accendi" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Spegni" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Tasto su" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Evidenzia dialogo precedente" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Tasto giљ" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Evidenzia dialogo successivo" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Cammina" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventario" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Oggetto" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Bianco e nero / colori" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Occhi" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Lingua" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Pugno" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Calcio" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Esamina" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Cursore normale" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Salva / Carica / Opzioni" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Altre opzioni di gioco:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventario:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Scorri lista verso l'alto" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Scorri lista verso il basso" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Oggetto in alto a sinistra" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Oggetto in basso a sinistra" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Oggetto in alto a destra" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Oggetto in basso a destra" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Oggetto al centro a sinistra" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Oggetto al centro a destra" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Cambio personaggio:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Secondo ragazzo" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Terzo ragazzo" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Controlli di combattimento (tastierino numerico):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Passo indietro" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Para in alto" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Para al centro" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Para in basso" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Colpisci in alto" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Colpisci al centro" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Colpisci in basso" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Questi sono i controlli quando" -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Indy ш sulla sinistra. Quando ш" -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "sulla destra, 7, 4 e 1 sostituiscono" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "rispettivamente 9, 6 e 3." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Controlli biplano (tastierino numerico):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Vola in alto a sinistra" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Vola a sinistra" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Vola in basso a sinistra" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Vola in alto" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Vola diritto" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Vola in basso" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Vola in alto a destra" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Vola a destra" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Vola in basso a destra" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1688,7 +1731,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1699,7 +1742,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1710,7 +1753,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1721,266 +1764,325 @@ msgstr "" "principale di ScummVM e seleziona la cartella \"Maniac\" all'interno della " "cartella di Day Of The Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Modalitр ~Z~ip attivata" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~T~ransizioni attive" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~E~ffetto acqua attivo" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Ripristina gioco:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Ripristina" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulatore OPL MAME" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Emulatore OPL DOSBox" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Nessuna musica" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Emulatore audio Amiga" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Emulatore AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Emulatore Apple II GS (NON IMPLEMENTATO)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Emulatore audio C64" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Avvio in corso dell'emulatore MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Emulatore MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Emulatore PC Speaker" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Emulatore IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Emulatore FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Mappa tasti:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Attivo)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Globale)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Gioco)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "MIDI Windows" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Menu principale di ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~M~odalitр mancini" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Controlli combattimento di ~I~ndy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Mostra cursore del mouse" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Aggancia ai bordi" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Compensa X del tocco" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Compensa Y del tocco" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Utilizza il controllo del cursore stile trackpad del portatile" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Un tocco per il clic sinistro, doppio tocco per il clic destro" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Sensibilitр" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Schermo in primo piano:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Schermo principale:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Ridimensionamento hardware (veloce, ma di bassa qualitр)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Ridimensionamento software (di buona qualitр, ma piљ lento)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Non ridimensionato (devi scorrere a sinistra e a destra)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Luminositр:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Audio ad alta qualitр (piљ lento) (riavviare)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Disattiva spegnimento in chiusura" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Modalitр touchpad attivata." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Modalitр touchpad disattivata." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normale (nessun ridimensionamento)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normale (no ridim.)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Cambia correzione proporzioni" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Cambia correzione proporzioni" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Cambia filtro grafico" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Resa grafica:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Conserve" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Modalitр video attuale:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Su" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Giљ" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Sinistra" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Destra" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Clic sinistro" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Clic destro" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zona" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multifunzione" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Cambia personaggio" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Salta testo" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Modalitр veloce" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Menu globale" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Tastiera virtuale" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Programmatore tasti" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Sei sicuro di voler uscire?" @@ -2101,133 +2203,190 @@ msgid "Network down" msgstr "Rete disattivata" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Avvio rete in corso" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Attesa per l'avvio della rete" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Rete non avviata (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Nascondi la barra degli strumenti" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Mostra tastiera" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Suono on/off" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Clic destro" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Mostra/nascondi cursore" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Osservazione libera" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Zoom avanti" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Zoom indietro" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Associa tasti" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Cursore su" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Cursore giљ" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Cursore a sinistra" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Cursore a destra" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vuoi caricare o salvare il gioco?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Sei sicuro di voler uscire? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Tastiera" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Rotazione" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Utilizzo del driver SDL " -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Visualizza " -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Vuoi eseguire una scansione automatica?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Mappa l'azione del tasto destro" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Devi mappare un tasto per l'azione \"Tasto destro\" per giocare" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Mappa l'azione nascondi barra degli strumenti" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Devi mappare un tasto per l'azione \"Nascondi barra degli strumenti\" per " "giocare" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Mappa l'azione Zoom Up (opzionale)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Mappa l'azione Zoom Down (opzionale)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Non dimenticare di mappare un tasto per l'azione \"Nascondi barra degli " "strumenti\" per vedere l'intero inventario" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volume" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volume" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Rilevati %d nuovi giochi." + +#~ msgid "Command line argument not processed" +#~ msgstr "Argomento della linea di comando non eseguito" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Emulatore FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Percorso non valido" diff --git a/po/nb_NO.po b/po/nb_NO.po index a23f0a7d1b..fcecbed832 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+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" @@ -20,108 +20,108 @@ msgstr "" "X-Poedit-Country: NORWAY\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(bygd den %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Funksjoner innkompilert:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Tilgjengelige motorer:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Gх til forrige mappenivх" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Velg" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Lukk" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Omkoble taster" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Velg en handling for kobling" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Koble" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Velg en handling, og trykk 'Koble'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Koblet tast : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Koblet tast: ingen" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Vennligst velg en handling" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Trykk tasten som skal kobles" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Spill" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -129,29 +129,29 @@ msgstr "" "Kort spill-identifikator, brukt for х referere til lagrede spill, og х kjјre " "spillet fra kommandolinjen" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Full spilltittel" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Sprхk:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -159,282 +159,282 @@ msgstr "" "Spillets sprхk. Dette vil ikke gjјre din spanske spillversjon om til engelsk " "versjon" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plattform spillet opprinnelig ble designet for" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Lyd" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Velg SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Velg mappe med spilldata" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Velg mappe med ytterligere data" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Velg mappe for lagrede spill" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vslutt" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Avslutt ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~V~alg..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Endre globale ScummVM-innstillinger" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Start valgt spill" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~Х~pne..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Хpne lagret spill for det valgte spillet" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~L~egg til spill..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Hold Shift for х legge til flere" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~R~ediger spill..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Endre spillinstillinger" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~F~jern spill" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 msgid "Remove game from the list. The game data files stay intact" msgstr "Fjern spill fra listen. Spilldataene forblir intakte" -#: gui/launcher.cpp:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~L~egg til spill..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~R~ediger spill..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~F~jern spill" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Sјk i spilliste" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Sјk:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Tјm verdi" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Хpne spill:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Хpne" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -442,205 +442,222 @@ msgstr "" "Vil du virkelig kjјre flerspill-finneren? Dette kan potensielt legge til et " "stort antall spill." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nei" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunne ikke хpne den valgte mappen!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Velg spill:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Vil du virkelig fjerne denne spillkonfigurasjonen?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Legg til flere..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Legg til flere..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Legg til spill..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Legg til spill..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... fremdrift ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Sјk fullfјrt!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Oppdaget %d nye spill." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Sjekket %d mapper ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Fant %d nye spill ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "hvert 5. min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "hvert 10. min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "hvert 15. min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "hvert 30. min" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stјttet av enkelte spill" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Aspekt-rate korrigering" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Korriger aspekt-rate for 320x200-spill" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA av-dithering" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Slхr av dithering i EGA-spill som stјtter det." -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Foretrukket enhet:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretrukket enh.:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -648,60 +665,60 @@ msgstr "" "Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt " "lydkort " -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Velger standard lydenhet for General MIDI-utdata" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Bruk fјrste tilgjengelige enhet" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Mikset AdLib/MIDI-modus" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Bruk bхde MIDI- og AdLib- lydgenerering" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "MT-32 Enhet:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -709,190 +726,191 @@ msgstr "" "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " "vil bruke dette." -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Aktiver Roland GS-modus" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Ikke bruk Roland MT-32-musikk" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Begge" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Teksthastighet:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Vis undertekster, og spill av tale" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Underteksthastighet:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Div" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI-tegner:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, 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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Velg mappe for lagrede spill" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Velg mappe for GUI-temaer" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Velg mappe for ytterligere filer" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Velg mappe for plugins" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -900,779 +918,804 @@ msgstr "" "Temaet du valgte stјtter ikke det aktive sprхket. Hvis du vil bruke dette " "temaet, mх du bytte til et annet sprхk fјrst." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Ingen dato lagret" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Ingen tid lagret" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Ingen spilltid lagret" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Slett" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Vil du virkelig slette dette lagrede spillet?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Dato: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Tid: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Spilltid: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Ikke navngitt spilltilstand" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Velg et tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Deaktivert GFX" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Deaktivert GFX" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standard Tegner (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Antialiased Tegner (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Antialiased (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motoren stјtter ikke debug-nivх '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Meny" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Hopp over linje" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Problem ved kjјring av spill:" -#: base/main.cpp:457 +#: base/main.cpp:456 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" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Ingen feil" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Spilldata ikke funnet" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Spill-ID ikke stјttet" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Ustјttet fargemodus" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Lesetilgang nektet" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Skrivetilgang nektet" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Stien eksisterer ikke" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Stien er ikke en mappe" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Stien er ikke en fil" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Kan ikke opprette fil" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Lesing av data feilet" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Dataskriving feilet" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Kunne ikke finne en passende engine-plugin" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Spillmotor-plugin stјtter ikke lagrede tilstander" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Kommandolinjeargument ikke behandlet" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Ukjent feil" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Grјnn" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Oransje" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Grјnn" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Oransje" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~F~ortsett" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~Х~pne" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~L~agre" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~V~alg" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~H~jelp" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~O~m" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Lagret spill:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Lagre" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~A~vbryt" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~aster" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~F~orrige" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~N~este" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~L~ukk" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Vanlige tastaturkommandoer:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Lagre- / хpne-dialog" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Hopp over tekstlinje" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Hopp over cutscene" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Space" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pause spill" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Хpne spilltilstand 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Lagre spilltilstand 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Avslutt" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Veksle fullskjerm" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Musikkvolum opp/ned" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Tekstfart saktere/raskere" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simuler venstre mustast" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simuler hјyre mustast" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Spesielle tastaturkommandoer:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Vis / Skjul konsollen" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Start debuggeren" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Vis minneforbruk" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Kjјr i rask modus (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Kjјr i virkelig rask modus (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Veksle muslхsing" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Bytt grafikkfiltre" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "иk / Minsk skaleringsfaktor" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Veksle aspekt-rate korrigering" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Merk at х bruke ctrl-f og" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g anbefales ikke, siden" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " de kan forхrsake krцsj, eller" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " feilaktig spilloppfјrsel." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Spinne drafts pх tastaturet:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Hovedkontroller for spill:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Dytt" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Dra" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Gi" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Хpne" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Gх til" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Fх" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Bruk" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Les" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Bytt unge" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Slх pх" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Slх av" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Gх til" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Plukk opp" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Hva er" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Lхs opp" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Ta pх tјy" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Ta av tјy" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Fiks" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Bytt" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Kikk" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Snakk" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Reis" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Til Henry / Til Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "Spill C moll pх distaffen" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "spill D pх distaffen" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "spill E pх distaffen" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "spill F pх distaffen" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "spill G pх distaffen" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "spill A pх distaffen" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "spill H pх distaffen" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "spill C dur pх distaffen" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Dytt" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Dra" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Snakk til" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Se pх" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Slх pх" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Slх av" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Ned-tast" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Merk forrige dialog" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Opp-tast" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Merk neste dialog" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Gх" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventar" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Gjenstand" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Svart/Hvitt / Farger" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "иyne" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Tunge" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Slх" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Spark" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Undersјk" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Vanlig muspeker" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Lagre / Хpne / Valg" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Andre spillkontroller" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventar:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Bla liste opp" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Bla liste ned" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "иvre venstre gjenstand" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Nedre venstre gjenstand" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "иvre hјyre gjenstand" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Nedre hјyre gjenstand" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Midtre venstre gjenstand" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Midtre hјyre gjenstand" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Bytte av karakterer:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Andre unge" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Tredje unge" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Kampkontroller (talltastatur)" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Bakoversteg" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Hјy blokk" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Mid-blokk" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Lav blokk" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Slх hјyt" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Slх midje" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Slх lavt" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Gjelder nхr Indy er til venstre." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Nхr Indy er til hјyre," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "Byttes 7, 4, og 1 med" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "henholdsvis 9, 6, og 3." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Flykontroller (talltastatur)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Fly til јvre venstre" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Fly til venstre" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Fly til nedre venstre" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Fly oppover" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Fly rett" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Fly ned" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Fly til јvre hјyre" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Fly til hјyre" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Fly til nedre hјyre" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1683,7 +1726,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1694,7 +1737,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1705,7 +1748,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1715,266 +1758,325 @@ msgstr "" "ennх. Sх, for х spille Maniac Mansion, gх til 'Legg til spill' i ScummVM-" "hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~O~verganger aktivert" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~V~anneffekt aktivert" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Gjennopprett spill:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Gjenopprett" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Ingen musikk" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Amiga Lydemulator" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib Emulator" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS Emulator (IKKE IMPLEMENTERT)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64 Lydemulator" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Initialiserer MT-32-Emulator" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC Speaker Emulator" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM PCjr Emulator" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM Towns Emulator" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Tastkobling:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Aktiv)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Spill)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "ScummVM Hovedmeny" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~V~enstrehendt modus" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~I~ndy kampkontroller" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Vis muspeker" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Hopp til kanter" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Gх til X-posisjon" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Gх til Y-posisjon" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Bruk bцrbar trackpad-stil muspekerkontroll" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Tap for venstreklikk, dobbelt-tap for hјyreklikk" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Fјlsomhet" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Skalering for јvre skjerm:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Hovedskjermsskalering:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Maskinvareskalering (rask, men lav kvalitet)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Programvareskalering (god kvalitet, men tregere)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Uskalert (du mх scrolle til venstre og hјyre)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Lysstyrke:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Hјy lydkvalitet (tregere) (omstart)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Deaktiver strјmsparing" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad-modus aktivert." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Touchpad-modus deaktivert." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Veksle aspekt-rate korrigering" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Veksle aspekt-rate korrigering" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Bytt grafikkfiltre" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Tegnemodus:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Bevar" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Nхvцrende videomodus:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Opp" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Ned" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Venstre" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Hјyre" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Venstreklikk" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Hјyreklikk" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Sone" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multifunksjon" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Bytt karakter" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Hopp over tekst" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Rask modus" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Global meny" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Virtuelt tastatur" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Tastkobler" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Vil du avslutte?" @@ -2096,134 +2198,191 @@ msgid "Network down" msgstr "Nettverket er nede" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Initialiserer nettverk" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Timeout under initialisering av nettverk" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Nettverk ikke initialisert (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Skjul verktјylinje" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Vis tastatur" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Lyd av/pх" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Hјyreklikk" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Vis/Skjul muspeker" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Frikikking" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Zoom opp" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Zoom ned" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Koble taster" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Peker opp" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Peker ned" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Peker venstre" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Peker hјyre" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vil du хpne eller lagre spillet?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Er du sikker pх at du vil avslutte ?" -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Tastatur" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Roter" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Bruk SDL-driver" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Skjerm" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Vil du utfјre et automatisk sјk?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Koble handling til hјyreklikk" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du mх koble en tast til handlingen 'Hјyreklikk' for х spille dette spillet" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Koble skjul-verktјylinje-handlingen" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Du mх koble en tast til 'Skjul verktјylinje'-handlingen for х spille dette " "spillet" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Koble handlingen Zoom Opp (valgfritt)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Koble handlingen Zoom Ned (valgfritt)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Ikke glem х koble en tast til handlingen 'Skjul verktјylinje' for х se hele " "inventaret" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volum" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volum" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Oppdaget %d nye spill." + +#~ msgid "Command line argument not processed" +#~ msgstr "Kommandolinjeargument ikke behandlet" + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM Towns Emulator" + #~ msgid "Invalid Path" #~ msgstr "Ugyldig sti" diff --git a/po/nn_NO.po b/po/nn_NO.po index 777c6e0e68..5e1083f93d 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+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" @@ -20,108 +20,108 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Poedit-Country: NORWAY\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(bygd den %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Funksjonar innkompilert:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Tilgjengelege motorar:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Gх til forrige mappenivх" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vel" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Steng" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Syn Tastatur" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Omkople tastar" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Vel ei handling for kopling:" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Kople" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Vel ei handling, og klikk 'Kople'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Kopla tast : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Kopla tast: ingen" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Vel ei handling" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Trykk tasten du vil kople" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Spel" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -129,29 +129,29 @@ msgstr "" "Kort spelidentifikator nytta for х referere til lagra spel, og х kјyre " "spelet frх kommandolinja" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Full speltittel:" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Sprхk:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -159,487 +159,504 @@ msgstr "" "Spelets sprхk. Dette vil ikkje gjere den spanske versjonen av spelet til ein " "engelsk versjon" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plattform spelet opprineleg vart designa for" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Lyd" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Vel SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Vel mappe med speldata" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Vel mappe for lagra spel" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 msgid "This game ID is already taken. Please choose another one." msgstr "" -#: gui/launcher.cpp:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vslutt" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Avslutt ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~V~al..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Endre globale ScummVM-instillingar" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Start det velde spelet" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~Х~pne..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Хpne eit lagra spel for the velde spelet" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~L~egg til spel..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Hold Shift nede for х legge til fleire" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~R~ediger spel..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Endre spelinstillingar" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~F~jern spel" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 msgid "Remove game from the list. The game data files stay intact" msgstr "" -#: gui/launcher.cpp:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~L~egg til spel..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~R~ediger spel..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~F~jern spel" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Sјk i spelliste" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Sјk:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Tјm verdi" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Хpne spel:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Хpne" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." msgstr "" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nei" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunne ikkje хpne den velde mappa!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Vel spelet:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Vil du verkeleg fjerne denne spelkonfigurasjonen?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Legg til fleire..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Legg til fleire..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Legg til spill..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Legg til spill..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... fremdrift ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Sјk fullfјrt!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Oppdaga %d nye spel." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Sјkt i %d mappar ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Oppdaga %d nye spel ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "kvart 5. min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "kvart 10. min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "kvart 15. min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "kvart 30. min" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Teiknemodus:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som stјttast av nokre spel" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Aspekt-korrigering" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Rett opp aspekt for 320x200 spel" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib nyttast til musikk i mange spel" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -647,249 +664,250 @@ msgstr "" "Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av " "lydkortet ditt" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Ikkje nytt General MIDI musikk" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont stјttast av enkelte lydkort, Fluidsynth og Timidity" -#: gui/options.cpp:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Blanda AdLib/MIDI-modus" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Nytt bхe MIDI og AdLib lydskaping" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (ingen GS-emulering)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Aktiver Roland GS-modus" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Ikkje nytt Roland MT-32 musikk" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Teksting" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Begge" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Bхe" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Vis teksting og spel av tale" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Div" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI-teiknar:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Tastar" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, 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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Vel mappe for lagra spel" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Vel ei mappe for GUI-tema:" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Vel ei mappe for plugins" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -897,782 +915,807 @@ msgstr "" "Temaet du har valt stјttar ikkje det aktive sprхket. Om du vil nytte dette " "temaet mх du bytte til eit anna sprхk fјrst." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Ingen dato lagra" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Inga tid lagra" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Inga speletid lagra" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Slett" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Vil du verkeleg slette det lagra spelet?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Dato: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Tid: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Speletid: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Ikkje navngjeven speltilstand" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Vel eit tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Deaktivert GFX" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Deaktivert GFX" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standard Teiknar (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Antialiased Teiknar (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Antialiased (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motoren stјttar ikkje debug-nivх '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Meny" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Hopp over linje" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Feil under kјyring av spel:" -#: base/main.cpp:457 +#: base/main.cpp:456 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." -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Ingen feil" -#: common/error.cpp:44 +#: common/error.cpp:40 #, fuzzy msgid "Game data not found" msgstr "Speldata ikkje funne" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Spel ID ikkje stјtta" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Ustјtta fargemodus" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Lesetilgang nekta" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Skrivetilgang nekta" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Stien eksisterar ikkje" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Stien er ikkje ei mappe" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Stien er ikkje ei fil" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Kan ikkje lage fil" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Lesing av data feila" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Dataskriving feila" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Kunne ikkje finne ein passande spelmotor-plugin" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Spelmotor-plugin stјttar ikkje lagra tilstandar." -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Ukjend feil" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Grјnn" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Raudgul" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Grјnn" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Raudgul" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~F~ortsett" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~Х~pne" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~L~agre" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~V~al" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~H~jelp" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~O~m" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 #, fuzzy msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 #, fuzzy msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Lagra spel:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Lagre" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~A~vbryt" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~astar" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~F~orrige" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~N~este" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~L~ukk" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Vanlege tastaturkommandoar:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Хpne- / Lagre-dialog" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Hopp over tekstlinje" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Hopp over cutscene" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Opprom" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pause spel" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Хpne speltilstand 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Lagre speltilstand 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Avslutt" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Veksle fullskjerm" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Musikkvolum opp / ned" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Tekstfart saktare / fortare" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simuler venstre musknapp" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simuler hјgre musknapp" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Spesielle tastaturkommandoar:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Vis / Skjul konsoll" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Start debuggaren" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Vis minneforbruk" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Kјyr i rask modus (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Kјyr i verkeleg rask modus (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Veksle muslхsing" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Veksle grafikkfiltre" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "иk/Minsk skaleringsfaktor" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Veksle aspekt-korrigering" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Merk at х bruke ctrl-f og" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g er ikkje anbefalt dх" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " dei kan forхrsake krцsj og" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " feilaktig speloppfјrsel." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Spinne drafts pх tastaturet:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Hovedkontrollar for spel:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Dytt" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Dra" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Gi" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Хpne" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Gх til" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Fх" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Nytt" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Les" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Bytt unge" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Slх pх" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Slх av" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Gх til" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Plukk opp" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Kva er" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Lхs opp" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Ta pх (klede)" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Ta av (klede)" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Fiks" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Bytt" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Kikk" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Snakk" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Reis" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Til Henry / Til Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "spel C moll pх distaffen " -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "spel D pх distaffen" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "spel E pх distaffen" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "spel F pх distaffen" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "spel G pх distaffen" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "spel A pх distaffen" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "spel H pх distaffen" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "spel C dur pх distaffen" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Dytt" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Dra" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Snakk til" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Se pх" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Slх pх" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Slх av" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Opp-tast" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Merk forrige dialog" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Ned-tast" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Merk neste dialog" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Gх" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventar" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objekt" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Svart-Kvitt / Fargar" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Auger" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Tunge" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Slх" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Spark" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Undersјk" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Vanleg peikar" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Хpne / Lagre / Val" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Andre spelkontrollar:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventar:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Bla liste opp" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Bla liste ned" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "иvre venstre gjenstand" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Nedre venstre gjenstand" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "иvre hјgre gjenstand" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Nedre hјgre gjenstand" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Midtre venstre gjenstand" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Midtre hјgre gjenstand" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Veksle karakterar:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Andre unge" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Tredje unge" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Kampkontrollar (taltastatur)" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Bakoversteg" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Hјg blokk" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Midt blokk" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Lav blokk" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Hјgt slag" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Midtslag" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Lavt slag" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Gjeld Indy pх Venstre side." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Med Indy pх hјgre side," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "byttast 7, 4, og 1 med" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6, og 3, henhaldsvis." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Flykontrollar (taltastatur)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Fly til јvre venstre" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Fly til venstre" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Fly til nedre venstre" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Fly oppover" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Fly rett" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Fly ned" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Fly til јvre hјgre" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Fly til hјgre" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Fly til nedre hјgre" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1680,7 +1723,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1688,7 +1731,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1696,7 +1739,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1706,266 +1749,325 @@ msgstr "" "det enno. For х spele Maniac Mansion, gх til 'Legg til spel' i ScummVM-" "menyen og vel 'Maniac'-undermappa i 'Tentacle'-mappa." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~O~vergangar aktivert" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~V~anneffekt aktivert" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Gjenopprett spel:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Gjenopprett" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Ingen musikk" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Amiga Lydemulator" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib Emulator" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS Emulator (IKKJE IMPLEMENTERT)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64 Lydemulator" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32-emulator" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC Speaker Emulator" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM PCjr Emulator" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM Towns Emulator" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Tastkopling:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Aktivt)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Spel)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "ScummVM Hovudmeny" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~V~enstrehendt modus" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~I~ndy-kampkontrollar" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Vis muspeikar" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Hopp til kantar" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Gх til X-posisjon" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Gх til Y-posisjon" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Tap for venstre-klikk, dobbelt-tap for hјgre-klikk" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Sensitivitet" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Hovudskjermsskalering:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Uskalert (du mх scrolle til venstre og hјgre)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Lysstyrke:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Deaktiver strјmsparing" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "" -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (inga skalering)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (inga skalering)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Veksle aspekt-korrigering" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Veksle aspekt-korrigering" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Veksle grafikkfiltre" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Teiknemodus:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Bevar" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Gjeldende videomodus:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Opp" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Ned" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Venstre" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Hјgre" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Venstreklikk" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Hјgreklikk" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Sone" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Rask modus" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Globalmeny" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Tastkopler" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Vil du avslutte?" @@ -2086,132 +2188,186 @@ msgid "Network down" msgstr "Nettverket er nede" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Initialiserer nettverk" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" -msgstr "" +#, fuzzy +msgid "Timeout while initializing network" +msgstr "Initialiserer nettverk" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Nettverk ikkje initialisert (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Skjul verktјylinje" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Syn tastatur" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Lyd av/pх" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Hјgreklikk" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Vis/Skjul Peikar" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Frikikking" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Zoom opp" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Zoom ned" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Kople tastar" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Peikar opp" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Peikar ned" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Peikar venstre" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Peikar hјgre" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vil du хpne eller lagre spelet?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr "Er du sikker pх at du vil avslutte?" -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Tastatur" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Roter" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Nyttar SDL-drivar" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Skjerm" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Vil du utfјre eit automatisk sјk?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Kople hјgreklikkshandling" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du mх kople ein tast til 'Hјgreklikk'-handlinga for х spele dette spelet" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Kople skjul-verktјylinje-handlinga" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Du mх kople ein tast til 'Skjul verktјylinje' for х spele dette spelet" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Kople Zoom Opp-handling (valfri)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Kople Zoom Ned-handling (valfri)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Ikkje glјym х kople ein tast til 'Skjul verktјylinje' for х se heile " "inventaret" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volum" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volum" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Oppdaga %d nye spel." + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM Towns Emulator" + #~ msgid "Invalid Path" #~ msgstr "Ugyldig sti" diff --git a/po/pl_PL.po b/po/pl_PL.po index d6e5b9b5e8..62a49070d1 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-05-02 12:09+0100\n" "Last-Translator: \n" "Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n" @@ -20,108 +20,108 @@ msgstr "" "X-Poedit-Language: Polish\n" "X-Poedit-Country: POLAND\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(skompilowany %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Wkompilowane funkcje:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Dostъpne silniki:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "W gѓrъ" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "PrzejdМ do poprzedniego katalogu" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "W gѓrъ" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Anuluj" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Wybierz" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Zamknij" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Klikniъcie" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "WyЖwietl klawiaturъ" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Dostosuj klawisze" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Wybierz akcjъ do przypisania" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Przypisz" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Wybierz akcjъ i kliknij 'Przypisz'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Przypisany klawisz : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Przypisany klawisz: brak" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Wybierz akcjъ" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "WciЖnij klawisz do przypisania" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Gra" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -129,514 +129,531 @@ msgstr "" "Krѓtki identyfikator gry uПywany do rozpoznawania zapisѓw i uruchamiania gry " "z linii komend" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nazwa:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "PeГny tytuГ gry:" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nazwa:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Jъzyk:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 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:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<domyЖlne>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Platforma, na ktѓrБ stworzono grъ" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "Grafika" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "DМwiъk" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "ІcieПka zapisѓw:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "OkreЖla gdzie zapisywaц stan gry" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "ІcieПka zapisѓw:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Brak" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "DomyЖlnie" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Wybierz SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Wybierz katalog z plikami gry" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Wybierz dodatkowy katalog gry" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Wybierz katalog dla zapisѓw" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 msgid "This game ID is already taken. Please choose another one." msgstr "Identyfikator jest juП zajъty. Wybierz inny." -#: gui/launcher.cpp:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~Z~akoёcz" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Zakoёcz ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "I~n~formacje..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "O ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~pcje..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Zmieё ustawienia ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Rozpocznij wybranБ grъ" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~W~czytaj..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Wczytaj zapis wybranej gry" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~D~odaj grъ..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Przytrzymaj Shift, by dodawaц zbiorowo" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~E~dytuj grъ..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Zmieё opcje gry" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~U~suё grъ" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~D~odaj grъ..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~dytuj grъ..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~U~suё grъ" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Wyszukaj grъ na liЖcie" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Szukaj" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "WyczyЖц" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Wczytaj grъ:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Wczytaj" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 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:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Tak" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nie" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nie moПe otworzyц katalogu!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM nie znalazГ Пadnej gry w tym katalogu!" -#: gui/launcher.cpp:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Wybierz grъ:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Na pewno chcesz usunБц tъ grъ z konfiguracji?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 msgid "This game does not support loading games from the launcher." msgstr "Ta gra nie wspiera wczytywania z launchera." -#: gui/launcher.cpp:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Masowe dodawanie..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Masowe dodawanie..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Dodaj grъ..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Dodaj grъ..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... postъp ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Skanowanie zakoёczone!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Wykryto %d nowych gier." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Przeskanowano %d katalogѓw ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Wykryto %d nowych gier..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Nigdy" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "co 5 min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "co 10 min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "co 15 min" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "co 30 min" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Brak" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Tryb grafiki:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Renderer:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Tryb peГnoekranowy" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Korekcja formatu obrazu" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Korekcja formatu obrazu dla gier 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "anty-dithering EGA" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "WГБcz anty-dithering we wspieranych grach EGA" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 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:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 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:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Emulator AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib jest uПywany do muzyki w wielu grach" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Czъst. wyj.:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -644,63 +661,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:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "UrzБdzenie GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 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:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Nie uПywaj muzyki General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "UПyj pierwszego dostъpnego urzБdzenia" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Tryb miksowanego AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 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:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Wzm. MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "UrzБdzenie MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -708,191 +725,192 @@ msgstr "" "Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland " "podГБczonej do twojego komputera" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "WГБcz tryb Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Nie uПywaj muzyki Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Mowa" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Napisy" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Oba" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Mowa" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Napisy" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "WyЖwietlaj napisy i odtwarzaj mowъ" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Wycisz" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "GГoЖnoЖц efektѓw dМw." -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Styl:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Renderer interf.:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Klawisze" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Jъzyk interfejsu:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Jъzyk interfejsu ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Wybierz katalog zapisѓw" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny." -#: gui/options.cpp:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Wybierz katalog dla stylѓw GUI." -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Wybierz katalog dla dodatkowych plikѓw" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Wybierz katalog dla wtyczek" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -900,779 +918,804 @@ msgstr "" "Wybrany styl nie obsГuguje obecnego jъzyka. JeЖli chcesz go uПywaц, zmieё " "najpierw swѓj jъzyk." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Brak daty" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Brak godziny" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Brak czasu gry" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Skasuj" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Na pewno chcesz skasowaц ten zapis?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Data: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Czas: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Czas gry: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Zapis bez nazwy" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Wybierz styl" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "WyГБczona grafika" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "WyГБczona grafika" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standardowy renderer (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standardowy (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "WygГadzany renderer (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "WygГadzany (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Silnik nie wspiera poziomu debugowania '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menu" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Wstrzymaj" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Pomiё liniъ" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "BГБd podczas uruchamiania gry:" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "Nie udaГo siъ znaleМц silnika zdolnego do uruchomienia zaznaczonej gry" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Brak bГъdu" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Nie znaleziono plikѓw gry" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Identyfikator gry nie jest wspierany" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Niewspierany tryb kolorѓw" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Brak praw do odczytu" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Brak praw do zapisu" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "ІcieПka nie istnieje" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "ІcieПka nie jest katalogiem" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "ІcieПka nie jest plikiem" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Nie moПna utworzyц pliku" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Odczyt danych nieudany" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Zapisywanie danych nie powiodГo siъ" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Nie udaГo siъ znaleМц odpowiedniej wtyczki silnika" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Silnik nie wspiera zapisu stanu gry" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Argument wiersza poleceё nie zostaГ przetworzony" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Nieznany bГБd" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Zielony Hercules" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Bursztynowy Hercules" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Zielony Hercules" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Bursztynowy Hercules" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~W~znѓw" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~W~czytaj" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~Z~apisz" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~pcje" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~P~omoc" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "~I~nformacje" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~P~owrѓt do launchera" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~P~owrѓt do launchera" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Zapis:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Zapisz" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~A~nuluj" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~K~lawisze" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~oprzedni" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~N~astъpny" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~Z~amknij" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Skrѓty klawiaturowe:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Okno Zapisz / Wczytaj" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Pomiё linijkъ tekstu" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Pomiё scenkъ" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Spacja" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Wstrzymaj grъ" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Wczytaj stan gry 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Zapisz stan gry 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Zakoёcz" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "WГБcz/wyГБcz peГny ekran" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Zwiъksz/zmniejsz gГoЖnoЖц muzyki" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Zwiъksz/zmniejsz prъdkoЖц tekstu" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Symuluje lewy przycisk myszy" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Symuluje prawy przycisk myszy" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Specjalne skrѓty klawiaturowe:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Schowaj / pokaП konsolъ" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "WГБcz debugger" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "PokaП zuПycie pamiъci" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "WГБcz w trybie szybkim (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "WГБcz w trybie bardzo szybkim (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "WГБcz/wyГБcz przechwytywanie myszy" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "PrzeГБczaj pomiъdzy filtrami grafiki" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Zwiъksz / zmniejsz wspѓГczynnik skalowania" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "WГБcz/wyГБcz korekcjъ formatu obrazu" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Miej na uwadze, Пe uПywanie ctrl-f" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " i ctrl-g nie jest wskazane" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " poniewaП mogБ one spowodowaц zawieszenie siъ," -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " bБdМ nieodpowiednie zachowanie gry." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Tkanie splotѓw na klawiaturze:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "GГѓwne sterowanie gry:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Pchnij" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "PociБgnij" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Daj" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Otwѓrz" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "IdМ do" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "WeМ" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "UПyj" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Czytaj" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Nowy dzieciak" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "WГБcz" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "WyГБcz" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "PodejdМ do" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "PodnieЖ" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Czym jest" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Otwѓrz" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "ZaГѓП" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Zdejmij" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Napraw" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "PrzeГБcz" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Spѓjrz" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Rozmawiaj" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "PodrѓПuj" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Do Henry'ego / Do Indy'ego" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "zagraj c-moll na kБdzieli" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "zagraj D na kБdzieli" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "zagraj E na kБdzieli" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "zagraj F na kБdzieli" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "zagraj G na kБdzieli" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "zagraj A na kБdzieli" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "zagraj B na kБdzieli" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "zagraj C-dur na kБdzieli" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "pchnj" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "pociБgnij (Yank)" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Rozmawiaj z" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Spѓjrz na" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "wГБcz" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "wyГБcz" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "StrzaГka do gѓry" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "PodЖwietl poprzedni dialog" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "StrzaГka w dѓГ" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "PodЖwietl nastъpny dialog" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "IdМ" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Ekwipunek" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Przedmiot" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Czarno-biaГy / Kolorowy" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Oczy" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Jъzyk" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "PiъЖц" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Kopniъcie" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Zbadaj" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "ZwykГy kursor" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Zapis / Odczyt / Opcje" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Reszta sterowania gry:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Ekwipunek:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Przewiё listъ do gѓry" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Przewiё listъ w dѓГ" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Przedmiot u gѓry, z lewej" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Przedmiot na dole, z lewej" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Przedmiot u gѓry, z prawej" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Przedmiot na dole, z prawej" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Przedmiot na Жrodku, z lewej" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Przedmiot na Жrodku, z prawej" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Zmiana postaci:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Drugi dzieciak" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Trzeci dzieciak" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Sterowanie podczas walki (klaw. num.):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Odsuё siъ" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Wysoki blok" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Іrodkowy blok" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Dolny blok" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Wysokie uderzenie" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Іrodkowe uderzenie" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Niskie uderzenie" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Te sБ dla Indy'ego po lewej." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Kiedy Indy jest po prawej," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4, i 1 zostajБ zamienione" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "na 9, 6 i 3." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Sterowanie dwupГatowcem (klaw. num.):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Leц do gѓry, w lewo" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Leц w lewo" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Leц na dѓГ, w lewo" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Leц do gѓry" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Leц prosto" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Leц w dѓГ" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Leц do gѓry, w prawo" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Leц w prawo" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Leц w dѓГ, w prawo" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1683,7 +1726,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1694,7 +1737,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1705,7 +1748,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1715,266 +1758,325 @@ msgstr "" "tego nie obsГuguje. Aby zagraц, uПyj \"Dodaj grъ...\" z menu startowego " "ScummVM i wybierz podkatalog \"Maniac\" z katalogu gry Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~T~ryb zip aktywny" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "~P~rzejЖcia wГБczone" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~E~fekty wody wГБczone" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Wznѓw grъ:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Wznѓw" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulator OPL MAME" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Emulator OPL DOSBox" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Brak muzyki" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Emulator dМwiъku Amigi" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Emulator AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Emulator Apple II GS (NIE ZAIMPLEMENTOWANY)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Emulator dМwiъku C64" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Inicjalizacja emulatora MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Emulator MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Emulator brzъczyka" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Emulator IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Emulator FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Klawisze:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Aktywny)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Globalny)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Gra)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "GГѓwne menu ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~T~ryb dla leworъcznych" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~S~terowanie walczБcym Indym" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "WyЖwietl kursor myszy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "PrzyciБganie do krawъdzi" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Przesuniъcie X ekranu do dotykania" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Przesuniъcie Y ekranu do dotykania" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "UПyj kursora w stylu trackpada z laptopa do sterowania" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Puknij raz, aby kliknБц LPM; dwa razy, aby kliknБц PPM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "CzuГoЖц" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Wstъpna skala gѓrnego ekranu:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Skalowanie gГѓwnego ekranu:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Skalowanie sprzъtowe (szybsze, ale niПszej jakoЖci)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Skalowanie programowe (wyПszej jakoЖci, ale wolniejsze)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Nieskalowany (musisz przewijaц w lewo i prawo)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "JasnoЖц:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "DМwiъk wysokiej jakoЖci (wolniejszy) (restart)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Nie wyГБczaj zasilania" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Tryb touchpada wГБczony." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Tryb touchpada wyГБczony." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "ZwykГy (bez skalowania)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "ZwykГy (bez skalowania)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "WГБcz/wyГБcz korekcjъ formatu obrazu" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "WГБcz/wyГБcz korekcjъ formatu obrazu" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "PrzeГБczaj pomiъdzy filtrami grafiki" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Renderer:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL - normalny" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL - zachow." -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL - pierw." -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Obecny tryb wideo:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Do gѓry" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "W dѓГ" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "W lewo" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "W prawo" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Klikniъcie LPM" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Klikniъcie PPM" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Strefa" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Wielozadaniowy" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Zmieё postaц" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Pomiё tekst" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Tryb szybki" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debugger" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Menu globalne" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Wirtualna klawiatura" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Mapper klawiszy" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Chcesz wyjЖц?" @@ -2095,131 +2197,188 @@ msgid "Network down" msgstr "Sieц nie dziaГa" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Inicjalizacja sieci" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Przekroczono limit czasu inicjalizacji sieci" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Sieц nie zostaГa zainicjalizowana (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Schowaj pasek narzъdzi" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "PokaП klawiaturъ" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "WГБcz/wyГБcz dМwiъk" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Klikniъcie PPM" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "PokaП/ukryj kursor" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Swobodne rozglБdanie siъ" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "PrzybliП" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Oddal" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Przypisz klawisze" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Kursor do gѓry" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Kursor w dѓГ" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Kursor w lewo" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Kursor w prawo" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Chcesz wczytaц bБdМ zapisaц grъ?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Na pewno chcesz wyjЖц? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Klawiatura" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Obrѓt" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "UПyj sterownika SDL " -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Obraz " -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Wykonaц automatyczne skanowanie?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Przypisz dziaГanie PPM" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Musisz przypisaц klawisz do 'PPM', by zagraц w tъ grъ" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Przypisz chowanie paska narzъdzi" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Musisz przypisaц przycisk 'Schowaj pasek narzъdzi', by zagraц w tъ grъ" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Przypisz PrzybliПanie (opcjonalne)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Przypisz Oddalenie (opcjonalne)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Nie zapomnij przypisaц klawisza 'Ukryj pasek narzъdzi', by widzieц caГy " "ekwipunek" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "GГoЖnoЖц" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "GГoЖnoЖц" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Wykryto %d nowych gier." + +#~ msgid "Command line argument not processed" +#~ msgstr "Argument wiersza poleceё nie zostaГ przetworzony" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Emulator FM Towns" + #~ msgid "Invalid Path" #~ msgstr "NiewГaЖciwa ЖcieПka" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3379123cc4..491bc286da 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-05-03 19:11-0300\n" "Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n" "Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n" @@ -20,108 +20,108 @@ msgstr "" "X-Poedit-Country: BRAZIL\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(desenvolvido em %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Funчѕes compiladas em:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Programas disponэveis:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Acima" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Ir para o diretѓrio anterior" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Acima" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Escolher" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Fechar" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Clique do mouse" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Mostrar teclado" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Remapear teclas" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Selecione uma aчуo para mapear" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Mapear" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Selecione uma aчуo e clique 'Mapear'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tecla associada: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tecla associada: nenhuma" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Por favor selecione uma aчуo" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Pressione a tecla para associar" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Jogo" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "Cѓdigo:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -129,311 +129,311 @@ 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:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "Cѓdigo:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Tэtulo completo do jogo" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Idioma:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 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:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<padrуo>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Sistema:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Sistema que o jogo foi desenvolvido originalmente" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Sistema:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Сudio" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Especifique a pasta para dados utilizados no jogo" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Pasta para Salvar" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Pasta para Salvar" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Nenhum(a)" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Selecione o SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Selecione a pasta com os arquivos do jogo" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Selecione a pasta adicional do jogo" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Selecione a pasta para os jogos salvos" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~S~air" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Sair do ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "So~b~re..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Sobre o ScumnmVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~O~pчѕes" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Alterar opчѕes globais do ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~I~niciar" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Iniciar jogo selecionado" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~C~arregar" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Carregar jogo salvo do jogo selecionado" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~A~dicionar Jogo..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Segure Shift para Multi-Adiчуo" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "~E~ditar Jogo..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Alterar opчѕes do jogo" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~R~emover Jogo" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~dicionar Jogo..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~ditar Jogo..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~R~emover Jogo" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Pesquisar na lista de jogos" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Pesquisar:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Limpar valor" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Carregar jogo:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Carregar" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -441,206 +441,223 @@ msgstr "" "Vocъ realmente deseja adicionar vсrios jogos ao mesmo tempo? Isso poderс " "resultar em uma adiчуo gigantesca de jogos." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sim" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nуo" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nуo conseguiu abrir a pasta especificada!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM nуo encontrou nenhum jogo na pasta especificada!" -#: gui/launcher.cpp:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Escolha o jogo:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Vocъ deseja realmente remover a configuraчуo deste jogo?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Multi-Adiчуo..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Multi-Adiчуo..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Adicionar Jogo..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Adicionar Jogo..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... progresso ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Busca completa!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Encontrado(s) %d novo(s) jogo(s)" +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "%d pasta(s) pesquisada(s)" -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Encontrado(s) %d novo(s) jogo(s)" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "a cada 5 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "a cada 10 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "a cada 15 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "a cada 30 mins" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Nenhum(a)" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Renderizaчуo" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Correчуo de proporчуo" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Correчуo de proporчуo para jogos 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA sem dithering" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Habilita EGA sem dithering em jogos com suporte" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 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:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 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:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib щ utilizado para mњsica em vсrios jogos" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -648,62 +665,62 @@ msgstr "" "Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado " "por sua placa de som" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 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:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Nуo usar mњsica General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Usar o primeiro dispositivo disponэvel" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Mixar AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar MIDI e AdLib juntos na geraчуo de som" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Ganho MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Dispositivo MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -711,193 +728,194 @@ msgstr "" "Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel " "com Roland" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sem emulaчуo GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Ligar modo Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Nуo usar mњsica Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Legendas" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Rapidez legendas:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Legs" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Mostrar legenda e vozes (dublagem)" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade das legendas:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Mudo" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volume dos efeitos sonoros especiais" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Renderizador GUI:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Idioma do GUI:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Linguagem do ScummVM GUI" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Vocъ tem que reiniciar o ScummVM para funcionar." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Selecione a pasta para o jogos salvos" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Selecione a pasta para os plugins" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -905,781 +923,806 @@ msgstr "" "O tema que vocъ selecionou nуo suporta seu idioma atual. Se vocъ quiser usar " "este tema vocъ precisa mudar para outro idioma." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Sem data salva" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Sem hora salva" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Sem tempo de jogo salvo" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Excluir" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Vocъ realmente quer excluir este jogo salvo?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Data:" -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Hora:" -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Tempo de jogo:" -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Nуo-titulado arquivo de save" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Selecione um Tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "GFX desabilitado" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "GFX desabilitado" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Renderizador padrуo (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Padrуo (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Renderizador Anti-Serrilhamento (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Anti-Serrilhamento (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Essa engine nуo suporta o nэvel de debug '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Menu" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausar" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Pula linha" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Erro ao executar o jogo:" -#: base/main.cpp:457 +#: base/main.cpp:456 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 " "selecionado" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Nenhum erro" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Dados do jogo nуo encontrado" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "ID de jogo nуo suportado" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Modo de cores nуo suportado" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Permissуo para \"ler\" negada" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Permissуo para \"gravar\" negada" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Caminho nуo existe" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Caminho nуo щ uma pasta" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Caminho nao щ um arquivo" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Caminho nуo щ um arquivo" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Falha na leitura" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Falha na gravaчуo" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Nуo foi possэvel encontrar engine adequada" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "A engine atual nуo suporta salvar o progresso do jogo" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Linha de comando nуo processada" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Erro desconhecido" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Green" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Amber" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Green" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~V~oltar ao jogo" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~C~arregar" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~S~alvar" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~O~pчѕes" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~A~juda" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "So~b~re" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~V~oltar ao menu" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~V~oltar ao menu" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Salvar jogo:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Salvar" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "~C~ancelar" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~eclas" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~A~nterior" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~P~rѓximo" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~F~echar" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Comandos de teclado comuns:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Menu Salvar / Carregar" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Pula linha de texto" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Pula cena" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Espaчo" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pausar jogo:" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Carregar estado do jogo 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Salvar estado do jogo 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Sair" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Habilita Tela Cheia" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Volume da mњsica" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Velocidade do texto devagar / rсpido" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simula botуo esquerdo do mouse" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simula botуo direito do mouse" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Comandos de teclado especiais:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Mostrar / Ocultar console" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Inicia o depurador" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Exibe o consumo de memѓria" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Joga em modo rсpido (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Joga em modo super rсpido (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Habilita captura do mouse" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Alterna entre os filtros grсficos" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Aumenta / Diminui o fator de escala" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Habilita correчуo de proporчуo" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* A utilizaчуo de ctrl-f ou" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g nуo щ recomendada" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " visto que poderс causar travas" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " ou procedimentos estranhos nos jogos." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Tecer feitiчos no teclado:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Controles principais do jogo:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Empurar" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Puxar" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Dar" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Abrir" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Ir para" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Pegar" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Usar" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Ler" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Nova crianчa" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Ligar" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Desligar" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Andar atщ" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Pegar" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "O que щ" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Destravar" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Vestir" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Decolar" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Consertar" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Trocar" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Olhar" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Falar" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Viajar" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Para Henry / Para Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "toca dѓ menor no fio" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "toca D no fio" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "toca E no fio" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "toca F no fio" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "toca G no fio" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "toca A no fio" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "toca B no fio" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "toca dѓ maior no fio" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Empurrar" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Puxar" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Falar" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Olhar para" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Ligar" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Desligar" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "TeclaCima" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Destacar diсlogo anterior" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "TeclaBaixo" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Destacar prѓximo diсlogo" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Andar" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventсrio" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objeto" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Preto e Branco / Cor" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Olhos" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Lэngua" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Soco" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Chute" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Examinar" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Cursor normal" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comunicador" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Salvar / Carregar / Opчѕes" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Outros controles do jogo:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventсrio:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Subir na lista" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Descer na lista" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Item da esquerda superior" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Item da esquerda inferior" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Item da direita superior" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Item da direita inferior" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Item do meio na esquerda" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Item do meio na direita" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Trocando personagens:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Segunda crianчa" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Terceira crianчa" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Controle de luta (teclado numщrico):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Passo para trсs" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Defender em cima" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Defender no meio" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Defender embaixo" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Soco em cima" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Soco no meio" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Soco embaixo" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Estes sуo para o Indy na esquerda." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Quando Indy estiver na direita," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4 e 1 sуo trocados por" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 e 3, respectivamente." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Controles do aviуo (teclado numщrico)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Voar para esquerda superior" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Voar para esquerda" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Voar para esquerda inferior" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Voar para cima" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Voar reto" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Voar para baixo" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Voar para direita superior" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Voar para direita" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Voar para direita inferior" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1690,7 +1733,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1701,7 +1744,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1712,7 +1755,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1723,266 +1766,325 @@ msgstr "" "adicione o jogo normalmente no ScummVM. Ele se encontra em um diretѓrio " "dentro da pasta do jogo Day of the Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Modo ~Z~ip ativado" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "Modo ~T~ransiчѕes ativado" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "Modo ~E~feitos de сgua ativado" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Restaurar jogo:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Restaurar" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulador MAME OPL" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Emulador DOSBox OPL" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Sem mњsica" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Emulador Som Amiga" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Emulador AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Emulador Apple II GS (NУO IMPLEMENTADO)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Emulador Som C64" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Inicializando Emulador MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Emulador MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Emulador PC Speaker" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Emulador IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Emulador FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Mapa de Teclas:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr "(Ativo)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr "(Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr "(Jogo)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "MIDI Windows" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Menu Principal ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Modo ~M~уo esquerda" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Controles de luta ~I~ndy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Mostrar o cursor do mouse" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Ajustar рs extremidades" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Equivalъncia do Toque X" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Equivalъncia do Toque Y" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Usar controle de curso do touchpad" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Um toque para o clique esquerdo, e toque duplo para o clique direito" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Sensibilidade" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Topo inicial para a escala de tela:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Escala de tela principal:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Escala pelo Hardware (rсpido, mas com baixa qualidade)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Escala pelo Software (qualidade boa, mas com lentidуo)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Sem escala (vocъ precisa rolar para a esquerda e para a direita)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Brilho:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Som de alta qualidade (mais lento) (reiniciar)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Desativar desligamento" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Modo Touchpad ligado." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Modo Touchpad desligado." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normal (sem escala)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (sem escala)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Habilita correчуo de proporчуo" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Habilita correчуo de proporчуo" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Alterna entre os filtros grсficos" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Renderizaчуo" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL Normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL Conserve" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL Original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Modo de vэdeo atual:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Cima" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Baixo" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Esquerda" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Direita" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Clique com o botуo esquerdo" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Clique com o botуo direito" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zona" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multi-funчуo" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Trocador de caracteres" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Pular texto" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Modo rсpido" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Depurador" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Menu global" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Teclado virtual" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Mapeador de Teclas" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Vocъ deseja sair ?" @@ -2103,134 +2205,191 @@ msgid "Network down" msgstr "Conexуo caiu" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Inicializaчуo de rede" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Tempo limite para iniciar a conexуo de rede" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Rede nуo inicializada (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Ocultar a barra de ferramentas" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Mostrar Teclado" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Som on/off" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Clique com o botуo direito" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Mostrar/Ocultar seu cursor" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Olhar livre" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Zoom para cima" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Zoom para baixo" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Botуo de ligadura" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Cursor para cima" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Cursor para baixo" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Cursor para a esquerda" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Cursor para a direita" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vocъ deseja carregar ou salvar o jogo?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Tem certeza de que deseja sair? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Teclado" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Rotacionar" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Usando driver SDL" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Tela" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Vocъ quer executar uma busca automсtica?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Mapear aчуo \"Clique da Direita\"" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Vocъ precisa mapear uma tecla para aчуo do \"Clique da Direita\" nesse jogo" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Mapear \"Ocultar barra de ferramentas\"" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Vocъ precisa mapear uma tecla para aчуo do \"Ocultar barra de ferramentas\" " "nesse jogo" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Mapear Zoom para Cima (opcional)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Mapear Zoom para Baixo (opcional)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Nуo se esqueчa de mapear uma tecla para \"Ocultar a barra de ferramentas\" " "para ver todo o seu inventсrio" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volume" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volume" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Encontrado(s) %d novo(s) jogo(s)" + +#~ msgid "Command line argument not processed" +#~ msgstr "Linha de comando nуo processada" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Emulador FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Pasta invсlida" diff --git a/po/ru_RU.po b/po/ru_RU.po index fdc7bd8fa2..6755a68f2a 100755..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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2010-06-13 20:55+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" @@ -18,108 +18,108 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%" "10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(собран %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Включенные в билд опции:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Доступные движки:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Перейти на директорию уровнем выше" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Отмена" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Выбрать" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Закрыть" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Клик мышью" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Показать клавиатуру" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Переназначить клавиши" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Выберите действие для назначения" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Назначить" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Выберите действие и кликните 'Назначить'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Назначенная клавиша : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Назначенная клавиша : нет" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Пожалуйста, выберите действие" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Нажмите клавишу для назначения" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Игра" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -127,29 +127,29 @@ msgstr "" "Короткий идентификатор, используемый для имен сохранений игр и для запуска " "из командной строки" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Название:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Полное название игры" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Назв:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Язык:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -157,282 +157,282 @@ msgstr "" "Язык игры. Изменение этого параметра не превратит игру на английском в " "русскую" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<по умолчанию>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Платформа, для которой игра была изначально разработана" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Графика" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "Грф" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Аудио" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Громкость" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Громк" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Путь к игре:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Где игра:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Указывает путь к дополнительным файлам данных для игры" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Сохранения игр:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Указывает путь к сохранениям игры" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Путь сохр:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Не задан" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "По умолчанию" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Выберите SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Выберите директорию с файлами игры" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Выберите дополнительную директорию игры" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Выберите директорию для сохранений" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 msgid "This game ID is already taken. Please choose another one." msgstr "Этот ID игры уже используется. Пожалуйста, выберите другой." -#: gui/launcher.cpp:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~В~ыход" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Выход из ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "О п~р~ограмме..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "О программе ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~О~пции..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Изменить глобальные опции ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "П~у~ск" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Запустить выбранную игру" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~З~агрузить..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Загрузить сохрнение для выбранной игры" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~Д~об. игру..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Удерживайте клавишу Shift для того, чтобы добавить несколько игр" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "О~п~ции игры..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Изменить опции игры" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~У~далить игру" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 msgid "Remove game from the list. The game data files stay intact" msgstr "Удалить игру из списка. Не удаляет игру с жесткого диска" -#: gui/launcher.cpp:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~Д~об. игру..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "О~п~ции игры..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~У~далить игру" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Поиск в списке игр" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Поиск:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Очистить значение" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Загрузить игру:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Загрузить" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -440,206 +440,224 @@ msgstr "" "Вы действительно хотите запустить детектор всех игр? Это потенциально может " "добавить большое количество игр." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Да" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Нет" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM не может открыть указанную директорию!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM не может найти игру в указанной директории!" -#: gui/launcher.cpp:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Выберите игру:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Вы действительно хотите удалить настройки для этой игры?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 msgid "This game does not support loading games from the launcher." msgstr "Эта игра не поддерживает загрузку сохранений через главное меню." -#: gui/launcher.cpp:949 +#: gui/launcher.cpp:940 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM не смог найти движок для запуска выбранной игры!" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Много игр..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Много игр..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Новая игра" -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Новая игра..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... ищу ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Поиск закончен!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Найдено %d новых игр." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Просмотрено %d директорий ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Найдено %d новых игр ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Никогда" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "каждые 5 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "каждые 10 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "каждые 15 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "каждые 30 минут" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Не задан" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Граф. режим:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Режим растра:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Полноэкранный режим" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Коррекция соотношения сторон" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Корректировать соотношение сторон для игр с разрешением 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA без растра" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "" -"Включает режим без растрирования в EGA играх, которые поддерживают такой режим" +"Включает режим без растрирования в EGA играх, которые поддерживают такой " +"режим" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Предпочитаемое:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Предпочитаемое:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Эмулятор AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "Звуковая карта AdLib используется многими играми" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Частота звука:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -647,64 +665,64 @@ msgstr "" "БОльшие значения задают лучшее качество звука, однако они могут не " "поддерживаться вашей звуковой картой" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Устройство GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Указывает выходное звуковое устройство для MIDI" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Не использовать музыку для General MIDI" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Использовать первое доступное устройство" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFontы поддердживаются некоторыми звуковыми картами, Fluidsynth и " "Timidity" -#: gui/options.cpp:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Смешанный режим AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Использовать и MIDI и AdLib для генерации звука" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Усиление MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Устр. MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Указывает звуковое устройство по умолчания для вывода на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -712,193 +730,194 @@ msgstr "" "Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы " "хотите его использовать" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Настоящий Roland MT-32 (запретить GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Включить режим Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Выключает маппинг General MIDI для игр с звуковой дорожкой для Roland MT-32" -#: gui/options.cpp:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Не использовать музыку для MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Субтитры" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Оба" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Оба" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Показывать субтитры и воспроизводить речь" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Выкл. всё" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Громкость SFX:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Громкость специальных звуковых эффектов" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Громк. SFX:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Путь к темам:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Где темы:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Указывает путь к дополнительным файлам данных, используемых всеми играми, " "либо ScummVM" -#: gui/options.cpp:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Рисовалка GUI:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Автосохранение:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Автосохр.:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Клавиши" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Язык GUI:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Язык графического интерфейса ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы должны перезапустить ScummVM чтобы применить изменения." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Выберите директорию для сохранений" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую." -#: gui/options.cpp:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Выберите директорию для тем GUI" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Выберите директорию с дополнительными файлами" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Выберите директорию с плагинами" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -906,779 +925,804 @@ msgstr "" "Тема, выбранная вами, не поддерживает выбранный язык. Если вы хотите " "использовать эту тему, вам необходимо сначала переключиться на другой язык." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Дата не записана" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Время не записано" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Время игры не записано" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Удалить" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Вы действительно хотите удалить это сохранение?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Дата: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Время: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Время игры: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Сохранение без имени" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Выберите тему" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Без графики" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Без графики" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Стандартный растеризатор (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Стандартный растеризатор (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Растеризатор со сглаживанием (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Растеризатор со сглаживанием (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Движок не поддерживает уровень отладки '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Меню" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Пауза" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Пропустить строку" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Ошибка запуска игры:" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "Не могу найти движок для запуска выбранной игры" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Нет ошибки" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Нет файлов игры" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Game id не поддерживается" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Неподдерживаемый режим цвета" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Недостаточно прав для чтения" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Недостаточно прав для записи" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Путь не найден" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Путь не является директорией" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Путь не является файлом" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Не могу создать файл" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Ошибка чтения данных" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Ошибка записи данных" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Не могу найти подходящий плагин для движка" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Движок не поддерживает сохранения" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Параметры командной строки не обработаны" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Зелёный" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Янтарный" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Зелёный" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Янтарный" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "Продол~ж~ить" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~З~агрузить" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~З~аписать" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~О~пции" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~П~омощь" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "О про~г~рамме" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~В~ыйти в главное меню" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~В~ главное меню" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Сохранить игру:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Сохранить" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "О~т~мена" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~К~лавиши" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~П~ред" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~С~лед" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~З~акрыть" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Общие клавиатурные команды:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Диалог записи / чтения" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Пропустить строку" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Пропустить заставку" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Пробел" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Пауза игры" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Загрузить игру 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Сохранить игру 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Выход" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Ввод" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" -msgstr "Переключить на весь экран" +msgstr "Переключить на весь экран" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Громкость музыки увеличить/уменьшить" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Скорость текста быстрее/медленнее" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Эмуляция нажатия левой клавиши мыши" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Эмуляция правой клавиши мыши" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Специальнве клавиатурные команды:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Показать/Убрать консоль" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Запуск отладчика" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Показать потребление памяти" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Запустить быстрый режим (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Запустить очень быстрый режим (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Переключение перехвата мыши" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Переключение между графическими фильтрами" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Увеличить/уменьшить масштаб" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Переключение коррекции соотношения сторон" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Использование ctrl-f и" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g не рекомендуется" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " так как они могут привести к" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " неверной работе игры." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Изменяемые черновики на клавиатуре:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Основное управление игрой:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Толкать" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Тянуть" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Дать" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Открыть" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Идти" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Взять" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Использовать" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Читать" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Новый перс" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Включить" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Выключить" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Идти к" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Поднять" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Что такое" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Открыть" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Положить" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Поднять" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Исправить" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Переключить" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Смотреть" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Говорить" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Путешествовать" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Генри/Инди" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "играть до минор на прялке" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "играть ре на прялке" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "играть ми на прялке" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "играть фа на прялке" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "играть соль на прялке" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "играть ля на прялке" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "играть си на прялке" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "играть до мажор на прялке" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "толкать" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "тянуть (цеплять)" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Говорить с" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Смотреть на" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "включить" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "выключить" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Вверх" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Подсветить предыдущий диалог" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Вниз" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Подсветить следующий диалог" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Идти" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Инвентарь" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Объект" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Черно-белый/Цветной" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Глаза" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Язык" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Удар" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Ногой" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Проверить" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Обычный курсор" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Комм" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Загрузить/Сохранить/Настройки" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Остальное управление игрой:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Инвентарь:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Прокрутить список вверх" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Прокрутить список вниз" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Верхний левый предмет" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Нижний левый предмет" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Верхний правый предмет" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Нижний правый предмет" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Средний левый предмет" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Средний правый предмет" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Смена героя:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Второй герой" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Третий герой" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Управление боем (цифровые клавиши)" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Шаг назад" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Защита сверху" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Защита посередине" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Защита снизу" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Удар сверху" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Удар посередине" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Удар снизу" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Это когда Инди слева." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Когда Инди справа," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4 и 1 меняются с" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 и 3 соответственно." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Управление самолётом (цифровые клавиши)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Лететь влево-вверх" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Лететь влево" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Лететь влево-вниз" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Лететь вверх" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Лететь прямо" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Лететь вниз" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Лететь вправо-вверх" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Лететь вправо" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Лететь вправо-вниз" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1689,7 +1733,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1700,7 +1744,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1711,276 +1755,335 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." msgstr "" "Сейчас должна запуститься игра Maniax Mansion. Но ScummVM пока это не умеет. " -"Чтобы сыграть, нажмите 'Новая игра' в стартовом меню ScummVM, а затем выберите " -"директорию Maniac внутри директории с игрой Tentacle." +"Чтобы сыграть, нажмите 'Новая игра' в стартовом меню ScummVM, а затем " +"выберите директорию Maniac внутри директории с игрой Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Режим быстрого перехода активирован" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "Переходы активированы" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "Эффекты воды включены" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Восстановить игру: " -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Восствновить" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Эмулятор MAME OPL" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Эмулятор DOSBox OPL" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Без музыки" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Эмулятор звука Amiga" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Эмулятор AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Эмулятор Apple II GS (отсутствует)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "Эмулятор звука C64" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Настраиваю эмулятор MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Эмулятор MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Эмулятор PC спикера" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Эмулятор IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Эмулятор FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Таблица клавиш:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Активная)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Глобальная)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Игры)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Главное меню ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Леворукий режим" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Управление боями в Indy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Показывать курсор мыши" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Прикрепить к границам" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Смещение касаний по оси X" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Смещение касаний по оси Y" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Использовать управление курсором как на трекпаде лептопов" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Тап для левого щелчка, двойной тап для правого щелчка" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Чувствительность" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Начальный масштаб верхнего экрана:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Масштаб главного экрана:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Хардварное масштабирование (быстро, но низкого качества)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Программное масштабирование (хорошее качество, но медленнее)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Без масштабирования (нужно будет прокручивать влево и вправо)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Яркость:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Высокое качество звука (медленнее) (ребут)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Запретить выключение" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Режим тачпада включен." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Режим тачпада выключен." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Без увеличения" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Без увеличения" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Переключение коррекции соотношения сторон" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Переключение коррекции соотношения сторон" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Переключение между графическими фильтрами" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Режим растра:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL без увеличения" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL с сохранением" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL изначальный" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Текущий видеорежим:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Вверх" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Вниз" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Влево" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Вправо" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Левый щелчок" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Правый щелчок" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Зона" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Мультифункция" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Сменить героя" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Пропустить текст" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Быстрый режим" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Отладчик" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Глобальное меню" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Виртуальная клавиатура" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Назначение клавиш" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Вы хотите выйти?" @@ -2101,131 +2204,188 @@ msgid "Network down" msgstr "Сеть выключена" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Настраиваю сеть" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Время подключения к сети истекло" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Сеть не настроилась (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Спрятать панель инструментов" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Показать клавиатуру" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Звук вкл/выкл" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Правый щелчок" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Показать/Убрать курсор" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Свободный обзор" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Увел. масштаб" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Уменьш. масштаб" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Назначить клавиши" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Курсор вверх" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Курсор вниз" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Курсор влево" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Курсор вправо" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Вы хотите загрузить либо сохранить игру?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Вы уверены, что хотите выйти? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Клавиатура" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Повернуть" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Использую драйвер SDL " -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Показать " -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Вы хотите произвести автоматический поиск?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Назначить действие по правому щелчку" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Вы должны назначить клавишу на действие 'Right Click' для этой игры" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Назначить действие 'спрятать панель инструментов'" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Вы должны назначить клавишу на дейтствие 'Hide toolbar' для этой игры" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Назначить действие Увеличить Масштаб (необязательно)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Назначить действие Уменьшить Масштаб (необязательно)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Не забудьте назначить клавишу для действия 'Hide Toolbar' чтобы увидеть весь " "инвентарь в игре" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Громкость" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Громкость" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Найдено %d новых игр." + +#~ msgid "Command line argument not processed" +#~ msgstr "Параметры командной строки не обработаны" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Эмулятор FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Неверный путь" diff --git a/po/scummvm.pot b/po/scummvm.pot index 8522a89ede..5c0f98e3ce 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ScummVM 1.3.0git\n" +"Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+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" @@ -16,1646 +16,1687 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" msgstr "" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 msgid "This game ID is already taken. Please choose another one." msgstr "" -#: gui/launcher.cpp:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "" -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "" -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 msgid "Remove game from the list. The game data files stay intact" msgstr "" -#: gui/launcher.cpp:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "" -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." msgstr "" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 msgid "ScummVM could not find any game in the specified directory!" msgstr "" -#: gui/launcher.cpp:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 msgid "This game does not support loading games from the launcher." msgstr "" -#: gui/launcher.cpp:949 +#: gui/launcher.cpp:940 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "" -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "" -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "" -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "" -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." +msgid "Discovered %d new games, ignored %d previously added games." msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "" -#: gui/massadd.cpp:254 +#: gui/massadd.cpp:253 #, c-format -msgid "Discovered %d new games ..." +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" -#: gui/options.cpp:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" -#: gui/options.cpp:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +msgid "You have to restart ScummVM before your changes will take effect." msgstr "" -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." msgstr "" -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "" -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "" -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "" -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "" -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr "" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr "" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +msgid " or incorrect game behavior." msgstr "" -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "" -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "" -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "" -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1663,7 +1704,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1671,7 +1712,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1679,273 +1720,326 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." msgstr "" -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +msgid "Initializing MT-32 Emulator" msgstr "" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr "" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr "" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr "" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "" -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +msgid "Enabled aspect ratio correction" +msgstr "" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +msgid "Disabled aspect ratio correction" +msgstr "" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +msgid "Active graphics filter:" +msgstr "" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +msgid "Windowed mode" +msgstr "" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +msgid "Current display mode" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "" @@ -2066,126 +2160,170 @@ msgid "Network down" msgstr "" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +msgid "Initializing network" msgstr "" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +msgid "Timeout while initializing network" msgstr "" #: backends/platform/wii/options.cpp:186 #, c-format -msgid "Network not initialised (%d)" +msgid "Network not initialized (%d)" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr "" -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +msgid "Maximum Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +msgid "Minimal Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" diff --git a/po/se_SE.po b/po/se_SE.po index 0bf6f3ac8b..2539c8ece8 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-05-02 13:07+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" @@ -20,109 +20,109 @@ msgstr "" "X-Poedit-Country: SWEDEN\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(byggt pх %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 #, fuzzy msgid "Features compiled in:" msgstr "Funktioner kompilerade i:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Tillgфngliga motorer" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Uppхt" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Gх till fіregхende katalognivх" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Uppхt" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vфlj" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Stфng" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Musklick" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Visa tangentbord" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Stфll in tangenter" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Vфlj en handling att stфlla in" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Stфll in" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Vфlj en handling och klicka pх \"Stфll in\"" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Instфlld tangent: %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Instфlld tangent: Ingen" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Var god vфlj en handling" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Tryck pх en tangent fіr att stфlla in" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Spel" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -130,29 +130,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:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Spelets fullstфndiga titel" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Sprхk:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -160,282 +160,282 @@ msgstr "" "Spelets sprхk. Den hфr instфllningen omvandlar inte din spanska spelversion " "till en engelsk" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Plattformen spelet ursprungligen tillverkades fіr" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Ljud" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 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:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Sіkv. sparat:" -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Bestфmmer var dina spardata lagras" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Sіkv. sparat:" -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Vфlj SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Vфlj katalog med speldata" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Vфlj en ytterligare spelkatalog" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Vфlj katalog fіr spardata" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 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:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vsluta" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Avsluta ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "O~m~..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~I~nstфllningar..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Redigera globala ScummVM-instфllningar" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "~S~tarta" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Starta det valda spelet" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~L~adda..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Ladda spardata fіr det valda spelet" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "Lф~g~g till spel..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Hхll ned Skift fіr masstillфgg" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "R~e~digera spel..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Redigera spelinstфllningarna" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~R~adera spel" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 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:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "Lф~g~g till spel..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "R~e~digera spel..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~R~adera spel" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Sіk i spellistan" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Sіk:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Tіm sіkfфltet" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Ladda spel:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Ladda" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -443,205 +443,222 @@ msgstr "" "Vill du verkligen anvфnda mass-speldetektorn? Processen kan potentiellt " "lфgga till ett enormt antal spel." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nej" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunde inte іppna den valda katalogen!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 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:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Vфlj spel:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Vill du verkligen radera den hфr spelkonfigurationen?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 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:949 +#: gui/launcher.cpp:940 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:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Masstillфgg..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Masstillфgg..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Lфgg till spel..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Lфgg till spel..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... progression ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Scanning fфrdig!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Nya spel upptфckta: %d." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Kataloger scannade: %d ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Nya spel upptфckta: %d ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "var 5:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "var 10:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "var 15:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "var 30:e minut" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Grafiklфge:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Renderingslфge:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlфgen stіdda av vissa spel" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Fullskфrmslфge" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Korrektion av bildfіrhхllande" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrigerar bildfіrhхllanden fіr 320x200-spel" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA anti-gitter" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Aktiverar anti-gitter i EGA spel som stіder det" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Fіredragen enhet:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fіredr. enhet:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "AdLib anvфnds fіr musik i mхnga spel" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Ljudfrekvens:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -649,61 +666,61 @@ msgstr "" "Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt " "ljudkort" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Anvфnd inte General MIDI-musik" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Anvфnd fіrsta tillgфngliga enhet" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 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:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Blandat AdLib/MIDI-lфge" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "MT-32 enhet:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 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:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -711,193 +728,194 @@ msgstr "" "Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-" "anslutna ljudenhet" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Фkta Roland MT-32 (ingen GM-emulation)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Aktivera Roland GS-lфge" -#: gui/options.cpp:798 +#: gui/options.cpp:852 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:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Anvфnd inte Roland MT-32 musik" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Undertext och tal:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Tal" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Undertexter" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Bхda" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text och tal:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Tal" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Text" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Bхda" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Visa undertexter och spela upp tal" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Ljud av" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Volym fіr specialeffekter" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 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:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "GUI-rendering:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Tangenter" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +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:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Vфlj katalog fіr spardata" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 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:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Vфlj katalog fіr GUI-teman" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Vфlj katalog fіr extra filer" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Vфlj katalog fіr tillфgg" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -905,783 +923,807 @@ msgstr "" "Temat du valde stіder inte ditt sprхk. Om du vill anvфnda det hфr temat " "mхste fіrst byta till ett annat sprхk." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Inget datum sparat" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Ingen tid sparad" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Ingen speltid sparad" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Radera" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Vill du verkligen radera den hфr spardatan?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Datum:" -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Tid:" -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Speltid:" -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Namnlіs spardata" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Vфlj ett tema" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Inaktiverad GFX" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Inaktiverad GFX" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Standard rendering (16 bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Standard (16 bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Antialiserad rendering (16 bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Antialiserad (16 bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motorn stіder inte debug-nivх '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Meny" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Paus" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Skippa rad" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Fel under kіrning av spel:" -#: base/main.cpp:457 +#: base/main.cpp:456 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" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Inget fel" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Kunde inte hitta speldata" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Spel-ID stіds inte" -#: common/error.cpp:48 +#: common/error.cpp:44 #, fuzzy msgid "Unsupported color mode" msgstr "Ej stіtt fфrglфge" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Lфstillbehіrighet nekad" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Skrivtillbehіrighet nekad" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Sіkvфgen existerar inte" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Sіkvфgen фr inte en katalog" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Sіkvфgen фr inte en fil" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Kan inte skapa fil" -#: common/error.cpp:65 +#: common/error.cpp:61 #, fuzzy msgid "Reading data failed" msgstr "Inlфsning misslyckades" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Skriva data misslyckades" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Kunde inte hitta lфmpligt motortillфgg" -#: common/error.cpp:72 +#: common/error.cpp:68 #, fuzzy msgid "Engine plugin does not support save states" msgstr "Motorn stіder inte debug-nivх '%s'" -#: common/error.cpp:75 -#, fuzzy -msgid "Command line argument not processed" -msgstr "Argument i kommandoraden ej verkstфllt" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Okфnt fel" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Herkules grіn" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Herkules bфrnsten" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Herkules grіn" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Herkules bфrnsten" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "~F~ortsфtt" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~L~adda" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~S~para" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~I~nstфllningar" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~H~jфlp" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "O~m~..." -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "Хte~r~vфnd till launcher" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "Хte~r~vфnd till launcher" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Spara spelet:" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Spara" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "A~v~bryt" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~T~angenter" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~F~іregхende" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~N~фsta" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~S~tфng" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Vanliga kortkommandon:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Spara / Ladda-fіnster" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Skippa textrad" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Skippa scen" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Mellanslag" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Pausa spelet" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Ladda spardata 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Spara speldata 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Avsluta" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Fullskфrmslфge" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Musikvolym hіj / sфnk" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Texthastighet sфnk / іka" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Simulera vфnster musknapp" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Simulera hіger musknapp" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Specialkortkommandon:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Visa / gіm konsol" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "жppna debug-konsolen" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Visa minnesfіrbrukning" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Kіr i snabblфge (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Kіr i extra snabbt lфge (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Musrestriktion av/pх" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Vфxla grafikfilter" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "жka / sфnk skalningsfaktor" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Korrektion av bildfіrhхllande pх/av" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Observera att anvфndning av ctrl-f" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr "och ctrl-g inte rekommenderas" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr "dх detta kan orsaka krascher" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr "eller felaktigt spelbeteende." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Vфva melodier med tangentbordet:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Huvudkontroller:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Tryck" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Dra" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Ge" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "жppna" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Gх till" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Ta emot" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Anvфnd" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Lфs" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Ny unge" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Sфtt pх" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Stфng av" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Gх till" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Ta" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Vad фr" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Lхs upp" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Ta pх" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Ta av" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Laga" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Byt" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Titta" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Tala" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Res" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "Till Henry / Till Indy" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "spela C-moll pх staven" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "spela D pх staven" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "spela E pх staven" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "spela F pх staven" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "spela G pх staven" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "spela A pх staven" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "spela H pх staven" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "spela C-dur pх staven" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Tryck" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "Dra" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Tala med" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Titta pх" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Sфtt pх" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Stфng av" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Piltangent upp" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Markera fіreg. dialog" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Piltangent ned" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Markera nфsta dialog" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Gх" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Inventarie" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Objekt" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Svartvitt / Fфrg" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "жgon" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Tunga" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Slх" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Sparka" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Undersіk" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Vanlig pekare" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Spara / Ladda / Inst." -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "жvriga spelkontroller:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Inventarie:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Blфddra listan uppхt" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Blфddra listan nedхt" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "жvre vфnstra fіremхlet" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Nedre vфnstra fіremхlet" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "жvre hіgra fіremхlet" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Nedre hіgra fіremхlet" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Mellersta vфnstra fіremхlet" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Mellersta hіgra fіremхlet" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Byta karaktфrer:" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Andra ungen" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Tredje ungen" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Slagsmхlskontroller (nr. tangenter)" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Steg bakхt" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Blockera hіgt" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Blockera midjehіjd" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Blockera lхgt" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Slх hіgt" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Slх midjehіjd" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Slх lхgt" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "Gфller nфr Indy stхr till vфnster." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Nфr Indy stхr till hіger byter" -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4 och 1 plats med" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 och 3." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Biplanskontroller (nr. tangenter)" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Flyg хt іvre vфnster" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Flyg хt vфnster" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Flyg хt nedre vфnster" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Flyg uppхt" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Flyg rakt fram" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Flyg nedхt" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Flyg хt іvre hіger" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Flyg хt hіger" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Flyg хt nedre hіger" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1692,7 +1734,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1703,7 +1745,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1714,7 +1756,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1724,266 +1766,325 @@ msgstr "" "фn. Fіr att spela spelet, gх till \"Lфgg till spel\" i ScummVM:s huvudmeny " "och vфlj \"Maniac\"-katalogen inuti \"Tentacle\" katalogen." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "~Z~iplфge aktiverat" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "жv~e~rgхngar aktiverade" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "~V~atteneffekt aktiverad" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Хterstфll spel:" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Хterstфll" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL-emulator" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL-emulator" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Ingen musik" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Amiga ljudemulator" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "AdLib-emulator" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS-emulator (INTE IMPLEMENTERAD)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64 ljudemulator" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32 emulator" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "MT-32 emulator" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "PC Speaker-emulator" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "IBM PCjr-emulator" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "FM Towns-emulator" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Tangenter:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr "(Aktiv)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr "(Global)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr "(Spel)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "ScummVM huvudmeny" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "~V~фnsterhфnt lфge" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "~I~ndy slagsmхlskontroller" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Visa muspekare" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Lфgg till kant" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Gх till X-position" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Gх till Y-position" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Anvфnd bфrbar trackpad-stil fіr pekarkontroll" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Tappa fіr vфnsterklick, dubbel-tappa fіr hіgerklick" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Kфnslighet" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Standardskala fіr іvre skфrm:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Skalning huvudskфrm:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Hхrdvaruskalning (snabbt, men lхg kvalitet)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Mjukvaruskalning (bra kvalitet, men lхngsamt)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Oskalat (du mхste blфddra till vфnster och hіger)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Ljusstyrka:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Hіg ljudkvalitet (lхngsammare) (omstart)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Inaktivera strіmsparning" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad-lфge aktiverat." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Touchpad-lфge inaktiverat." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Normalt (ingen skalning)" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normalt (ingen skalning)" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Korrektion av bildfіrhхllande pх/av" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Korrektion av bildfіrhхllande pх/av" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Vфxla grafikfilter" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Renderingslфge:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL normal" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" msgstr "OpenGL konservation" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL original" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Aktivt videolфge:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Upp" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Ned" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Vфnster" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Hіger" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Vфnsterklick" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Hіgerklick" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Zon" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Multifunktion" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Byt karaktфr" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Skippa text" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Snabblфge" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Debug-konsol" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Global meny" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Virtuellt tangentbord" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Tangentinst." -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Vill du avsluta?" @@ -2104,134 +2205,192 @@ msgid "Network down" msgstr "Nфtverk inaktivt" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Initialiserar nфtverk" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Timeout under initialisering av nфtverk" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Nфtverk ej initialiserat (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Gіm verktygsrad" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Visa tangentbord" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Ljud av/pх" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Hіgerklick" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Gіm/visa pekare" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Frititt" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Zooma upp" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Zooma ned" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Fіrbind tangenter" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Pekare upp" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Pekare ned" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Pekare vфnster" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Pekare hіger" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vill du ladda eller spara spelet?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr "Фr du sфker pх att du vill avsluta?" -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Tangentbord" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Rotera" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Anvфnd SDL-driver" -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Skфrm" -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Vill du utfіra en automatisk scan?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Stфll in hіgerklick" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du mхste vфlja en tangent fіr \"Hіgerklick\" fіr att spela det hфr spelet" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Stфll in gіm verktygsrad" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Du mхste vфlja en tangent fіr \"Gіm verktygsrad\" fіr att spela det hфr " "spelet" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Stфll in Zooma up (valfritt)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Stфll in Zooma ned (valfritt)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Glіm inte att vфlja en tangent fіr \"Gіm verktygsrad\" fіr att se hela " "inventariet" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Volym" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Volym" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Nya spel upptфckta: %d." + +#, fuzzy +#~ msgid "Command line argument not processed" +#~ msgstr "Argument i kommandoraden ej verkstфllt" + +#~ msgid "FM Towns Emulator" +#~ msgstr "FM Towns-emulator" + #~ msgid "Invalid Path" #~ msgstr "Ogiltig sіkvфg" diff --git a/po/uk_UA.po b/po/uk_UA.po index 8903d18541..32c7132ff6 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: 2011-04-22 19:33+0100\n" +"POT-Creation-Date: 2011-06-06 23:15+0100\n" "PO-Revision-Date: 2011-03-26 22:38+0200\n" "Last-Translator: Lubomyr Lisen\n" "Language-Team: Ukrainian\n" @@ -18,108 +18,108 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%" "10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: gui/about.cpp:96 +#: gui/about.cpp:91 #, c-format msgid "(built on %s)" msgstr "(зібраний %s)" -#: gui/about.cpp:103 +#: gui/about.cpp:98 msgid "Features compiled in:" msgstr "Включені в білд опції:" -#: gui/about.cpp:112 +#: gui/about.cpp:107 msgid "Available engines:" msgstr "Доступні движки:" -#: gui/browser.cpp:70 +#: gui/browser.cpp:66 msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:70 gui/browser.cpp:72 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "Перейти на папку рівнем вище" -#: gui/browser.cpp:72 +#: gui/browser.cpp:68 msgctxt "lowres" msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:73 gui/chooser.cpp:49 gui/KeysDialog.cpp:46 -#: gui/launcher.cpp:319 gui/massadd.cpp:95 gui/options.cpp:1124 -#: gui/saveload.cpp:66 gui/saveload.cpp:158 gui/themebrowser.cpp:57 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 #: backends/platform/wii/options.cpp:48 msgid "Cancel" msgstr "Відміна" -#: gui/browser.cpp:74 gui/chooser.cpp:50 gui/themebrowser.cpp:58 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Вибрати" -#: gui/gui-manager.cpp:106 engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:211 -#: backends/keymapper/remap-dialog.cpp:54 +#: gui/gui-manager.cpp:114 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:190 engines/scumm/help.cpp:208 +#: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Закрити" -#: gui/gui-manager.cpp:109 +#: gui/gui-manager.cpp:117 msgid "Mouse click" msgstr "Клік мишкою" -#: gui/gui-manager.cpp:112 base/main.cpp:281 +#: gui/gui-manager.cpp:120 base/main.cpp:280 msgid "Display keyboard" msgstr "Показати клавіатуру" -#: gui/gui-manager.cpp:115 base/main.cpp:284 +#: gui/gui-manager.cpp:123 base/main.cpp:283 msgid "Remap keys" msgstr "Перепризначити клавіші" -#: gui/KeysDialog.h:39 gui/KeysDialog.cpp:148 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Виберіть дію для призначення" -#: gui/KeysDialog.cpp:44 +#: gui/KeysDialog.cpp:41 msgid "Map" msgstr "Призначити" -#: gui/KeysDialog.cpp:45 gui/launcher.cpp:320 gui/launcher.cpp:945 -#: gui/launcher.cpp:949 gui/massadd.cpp:92 gui/options.cpp:1125 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 +#: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 #: backends/platform/wii/options.cpp:47 -#: backends/platform/wince/CELauncherDialog.cpp:58 +#: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" -#: gui/KeysDialog.cpp:52 +#: gui/KeysDialog.cpp:49 msgid "Select an action and click 'Map'" msgstr "Виберіть дію і клікніть 'Призначити'" -#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Призначена клавіша : %s" -#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Призначена клавіша : немає" -#: gui/KeysDialog.cpp:93 +#: gui/KeysDialog.cpp:90 msgid "Please select an action" msgstr "Будь ласка, виберіть дію" -#: gui/KeysDialog.cpp:109 +#: gui/KeysDialog.cpp:106 msgid "Press the key to associate" msgstr "Натисніть клавішу для призначення" -#: gui/launcher.cpp:172 +#: gui/launcher.cpp:165 msgid "Game" msgstr "Гра" -#: gui/launcher.cpp:176 +#: gui/launcher.cpp:169 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 +#: gui/launcher.cpp:169 gui/launcher.cpp:171 gui/launcher.cpp:172 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -127,312 +127,311 @@ msgstr "" "Короткий ідентифікатор, який використовується для назв збережених ігор і для " "запуску з командної стрічки" -#: gui/launcher.cpp:178 +#: gui/launcher.cpp:171 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:183 +#: gui/launcher.cpp:176 msgid "Name:" msgstr "Назва:" -#: gui/launcher.cpp:183 gui/launcher.cpp:185 gui/launcher.cpp:186 +#: gui/launcher.cpp:176 gui/launcher.cpp:178 gui/launcher.cpp:179 msgid "Full title of the game" msgstr "Повна назва гри" -#: gui/launcher.cpp:185 +#: gui/launcher.cpp:178 msgctxt "lowres" msgid "Name:" msgstr "Назва:" -#: gui/launcher.cpp:189 +#: gui/launcher.cpp:182 msgid "Language:" msgstr "Мова:" -#: gui/launcher.cpp:189 gui/launcher.cpp:190 +#: gui/launcher.cpp:182 gui/launcher.cpp:183 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "" -"Мова гри. Зміна цього параметру не перетворить гру англійською в " -"українську" +"Мова гри. Зміна цього параметру не перетворить гру англійською в українську" -#: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80 -#: gui/options.cpp:654 gui/options.cpp:664 gui/options.cpp:1095 -#: audio/null.cpp:42 +#: gui/launcher.cpp:184 gui/launcher.cpp:198 gui/options.cpp:74 +#: gui/options.cpp:708 gui/options.cpp:718 gui/options.cpp:1149 +#: audio/null.cpp:40 msgid "<default>" msgstr "<за умовчанням>" -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:194 msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:201 gui/launcher.cpp:203 gui/launcher.cpp:204 +#: gui/launcher.cpp:194 gui/launcher.cpp:196 gui/launcher.cpp:197 msgid "Platform the game was originally designed for" msgstr "Платформа, для якої гра була спочатку розроблена" -#: gui/launcher.cpp:203 +#: gui/launcher.cpp:196 msgctxt "lowres" msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:215 gui/options.cpp:964 gui/options.cpp:981 +#: gui/launcher.cpp:208 gui/options.cpp:1018 gui/options.cpp:1035 msgid "GFX" msgstr "Грф" -#: gui/launcher.cpp:218 +#: gui/launcher.cpp:211 msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:220 +#: gui/launcher.cpp:213 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:227 gui/options.cpp:987 +#: gui/launcher.cpp:220 gui/options.cpp:1041 msgid "Audio" msgstr "Аудіо" -#: gui/launcher.cpp:230 +#: gui/launcher.cpp:223 msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:232 +#: gui/launcher.cpp:225 msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:241 gui/options.cpp:992 +#: gui/launcher.cpp:234 gui/options.cpp:1046 msgid "Volume" msgstr "Гучність" -#: gui/launcher.cpp:243 gui/options.cpp:994 +#: gui/launcher.cpp:236 gui/options.cpp:1048 msgctxt "lowres" msgid "Volume" msgstr "Гучн-ть" -#: gui/launcher.cpp:246 +#: gui/launcher.cpp:239 msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:248 +#: gui/launcher.cpp:241 msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:255 gui/options.cpp:1002 +#: gui/launcher.cpp:248 gui/options.cpp:1056 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:251 msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:260 +#: gui/launcher.cpp:253 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:270 gui/options.cpp:1008 +#: gui/launcher.cpp:263 gui/options.cpp:1062 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:273 +#: gui/launcher.cpp:266 msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:275 +#: gui/launcher.cpp:268 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:286 gui/options.cpp:1015 +#: gui/launcher.cpp:279 gui/options.cpp:1069 msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:288 gui/options.cpp:1017 +#: gui/launcher.cpp:281 gui/options.cpp:1071 msgctxt "lowres" msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:295 +#: gui/launcher.cpp:288 msgid "Game Path:" msgstr "Шлях до гри: " -#: gui/launcher.cpp:297 +#: gui/launcher.cpp:290 msgctxt "lowres" msgid "Game Path:" msgstr "Шлях до гри: " -#: gui/launcher.cpp:302 gui/options.cpp:1037 +#: gui/launcher.cpp:295 gui/options.cpp:1091 msgid "Extra Path:" msgstr "Додатк. шлях:" -#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/launcher.cpp:295 gui/launcher.cpp:297 gui/launcher.cpp:298 msgid "Specifies path to additional data used the game" msgstr "Вказує шлях до додаткових файлів даних для гри" -#: gui/launcher.cpp:304 gui/options.cpp:1039 +#: gui/launcher.cpp:297 gui/options.cpp:1093 msgctxt "lowres" msgid "Extra Path:" msgstr "Дод. шлях:" -#: gui/launcher.cpp:309 gui/options.cpp:1025 +#: gui/launcher.cpp:302 gui/options.cpp:1079 msgid "Save Path:" msgstr "Шлях збер.: " -#: gui/launcher.cpp:309 gui/launcher.cpp:311 gui/launcher.cpp:312 -#: gui/options.cpp:1025 gui/options.cpp:1027 gui/options.cpp:1028 +#: gui/launcher.cpp:302 gui/launcher.cpp:304 gui/launcher.cpp:305 +#: gui/options.cpp:1079 gui/options.cpp:1081 gui/options.cpp:1082 msgid "Specifies where your savegames are put" msgstr "Вказує шлях до збережень гри" -#: gui/launcher.cpp:311 gui/options.cpp:1027 +#: gui/launcher.cpp:304 gui/options.cpp:1081 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях збер.: " -#: gui/launcher.cpp:328 gui/launcher.cpp:411 gui/launcher.cpp:460 -#: gui/options.cpp:1034 gui/options.cpp:1040 gui/options.cpp:1047 -#: gui/options.cpp:1148 gui/options.cpp:1154 gui/options.cpp:1160 -#: gui/options.cpp:1168 gui/options.cpp:1192 gui/options.cpp:1196 -#: gui/options.cpp:1202 gui/options.cpp:1209 gui/options.cpp:1308 +#: gui/launcher.cpp:321 gui/launcher.cpp:404 gui/launcher.cpp:453 +#: gui/options.cpp:1088 gui/options.cpp:1094 gui/options.cpp:1101 +#: gui/options.cpp:1202 gui/options.cpp:1208 gui/options.cpp:1214 +#: gui/options.cpp:1222 gui/options.cpp:1246 gui/options.cpp:1250 +#: gui/options.cpp:1256 gui/options.cpp:1263 gui/options.cpp:1362 msgctxt "path" msgid "None" msgstr "Не завданий" -#: gui/launcher.cpp:333 gui/launcher.cpp:415 +#: gui/launcher.cpp:326 gui/launcher.cpp:408 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "За умовчанням" -#: gui/launcher.cpp:453 gui/options.cpp:1302 +#: gui/launcher.cpp:446 gui/options.cpp:1356 msgid "Select SoundFont" msgstr "Виберіть SoundFont" -#: gui/launcher.cpp:472 gui/launcher.cpp:619 +#: gui/launcher.cpp:465 gui/launcher.cpp:612 msgid "Select directory with game data" msgstr "Виберіть папку з файлами гри" -#: gui/launcher.cpp:490 +#: gui/launcher.cpp:483 msgid "Select additional game directory" msgstr "Виберіть додаткову папку гри" -#: gui/launcher.cpp:502 +#: gui/launcher.cpp:495 msgid "Select directory for saved games" msgstr "Виберіть папку для збережень" -#: gui/launcher.cpp:521 +#: gui/launcher.cpp:514 msgid "This game ID is already taken. Please choose another one." msgstr "Цей ID гри вже використовується. Будь ласка, виберіть інший." -#: gui/launcher.cpp:562 engines/dialogs.cpp:113 +#: gui/launcher.cpp:555 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~В~ихід" -#: gui/launcher.cpp:562 +#: gui/launcher.cpp:555 msgid "Quit ScummVM" msgstr "Вихід з ScummVM" -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "A~b~out..." msgstr "Про п~р~ограму..." -#: gui/launcher.cpp:563 +#: gui/launcher.cpp:556 msgid "About ScummVM" msgstr "Про ScummVM" -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "~O~ptions..." msgstr "~О~пції..." -#: gui/launcher.cpp:564 +#: gui/launcher.cpp:557 msgid "Change global ScummVM options" msgstr "Змінити глобальні опції ScummVM" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "~S~tart" msgstr "З~а~пуск" -#: gui/launcher.cpp:566 +#: gui/launcher.cpp:559 msgid "Start selected game" msgstr "Запустити вибрану гру" -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "~L~oad..." msgstr "~З~аван..." -#: gui/launcher.cpp:569 +#: gui/launcher.cpp:562 msgid "Load savegame for selected game" msgstr "Завантажити збереження для вибраної гри" -#: gui/launcher.cpp:574 +#: gui/launcher.cpp:567 msgid "~A~dd Game..." msgstr "~Д~од. гру..." -#: gui/launcher.cpp:574 gui/launcher.cpp:581 +#: gui/launcher.cpp:567 gui/launcher.cpp:574 msgid "Hold Shift for Mass Add" msgstr "Утримуйте клавішу Shift для того, щоб додати декілька ігор" -#: gui/launcher.cpp:576 +#: gui/launcher.cpp:569 msgid "~E~dit Game..." msgstr "Реда~г~. гру..." -#: gui/launcher.cpp:576 gui/launcher.cpp:583 +#: gui/launcher.cpp:569 gui/launcher.cpp:576 msgid "Change game options" msgstr "Змінити опції гри" -#: gui/launcher.cpp:578 +#: gui/launcher.cpp:571 msgid "~R~emove Game" msgstr "~В~идалити гру" -#: gui/launcher.cpp:578 gui/launcher.cpp:585 +#: gui/launcher.cpp:571 gui/launcher.cpp:578 msgid "Remove game from the list. The game data files stay intact" msgstr "Видалити гру зі списку. Не видаляє гру з жорсткого диску" -#: gui/launcher.cpp:581 +#: gui/launcher.cpp:574 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~Д~одати гру..." -#: gui/launcher.cpp:583 +#: gui/launcher.cpp:576 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Реда~г~. гру..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:578 msgctxt "lowres" msgid "~R~emove Game" msgstr "~В~идалити гру" -#: gui/launcher.cpp:593 +#: gui/launcher.cpp:586 msgid "Search in game list" msgstr "Пошук у списку ігор" -#: gui/launcher.cpp:597 gui/launcher.cpp:1111 +#: gui/launcher.cpp:590 gui/launcher.cpp:1102 msgid "Search:" msgstr "Пошук:" -#: gui/launcher.cpp:600 gui/options.cpp:772 +#: gui/launcher.cpp:593 gui/options.cpp:826 msgid "Clear value" msgstr "Очистити значення" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Завантажити гру:" -#: gui/launcher.cpp:622 engines/dialogs.cpp:117 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:715 engines/cruise/menu.cpp:218 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Завантажити" -#: gui/launcher.cpp:731 +#: gui/launcher.cpp:723 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -440,204 +439,221 @@ msgstr "" "Чи ви дійсно хочете запустити детектор усіх ігор? Це потенційно може додати " "велику кількість ігор." -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Так" -#: gui/launcher.cpp:732 gui/launcher.cpp:881 -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: gui/launcher.cpp:724 gui/launcher.cpp:872 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Ні" -#: gui/launcher.cpp:779 +#: gui/launcher.cpp:772 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM не може відкрити вказану папку!" -#: gui/launcher.cpp:791 +#: gui/launcher.cpp:784 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM не може знайти гру у вказаній папці!" -#: gui/launcher.cpp:805 +#: gui/launcher.cpp:798 msgid "Pick the game:" msgstr "Виберіть гру:" -#: gui/launcher.cpp:881 +#: gui/launcher.cpp:872 msgid "Do you really want to remove this game configuration?" msgstr "Ви дійсно хочете видалити установки для цієї гри?" -#: gui/launcher.cpp:945 +#: gui/launcher.cpp:936 msgid "This game does not support loading games from the launcher." msgstr "Ця гра не підтримує завантаження збережень через головне меню." -#: gui/launcher.cpp:949 +#: gui/launcher.cpp:940 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM не зміг знайти движок для запуску вибраної гри!" -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgctxt "lowres" msgid "Mass Add..." msgstr "Дод. багато..." -#: gui/launcher.cpp:1063 +#: gui/launcher.cpp:1054 msgid "Mass Add..." msgstr "Дод. багато..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgctxt "lowres" msgid "Add Game..." msgstr "Додати гру..." -#: gui/launcher.cpp:1064 +#: gui/launcher.cpp:1055 msgid "Add Game..." msgstr "Додати гру..." -#: gui/massadd.cpp:79 gui/massadd.cpp:82 +#: gui/massadd.cpp:76 gui/massadd.cpp:79 msgid "... progress ..." msgstr "... пошук ..." -#: gui/massadd.cpp:244 +#: gui/massadd.cpp:243 msgid "Scan complete!" msgstr "Пошук закінчено!" -#: gui/massadd.cpp:247 +#: gui/massadd.cpp:246 #, c-format -msgid "Discovered %d new games." -msgstr "Знайдено %d нових ігор." +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" -#: gui/massadd.cpp:251 +#: gui/massadd.cpp:250 #, c-format msgid "Scanned %d directories ..." msgstr "Проглянуто %d папок ..." -#: gui/massadd.cpp:254 -#, c-format -msgid "Discovered %d new games ..." +#: gui/massadd.cpp:253 +#, fuzzy, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Знайдено %d нових ігор ..." -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "Never" msgstr "Ніколи" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 5 mins" msgstr "кожні 5 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 10 mins" msgstr "кожні 10 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 15 mins" msgstr "кожні 15 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:72 msgid "every 30 mins" msgstr "кожні 30 хв" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:74 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:242 gui/options.cpp:407 gui/options.cpp:505 -#: gui/options.cpp:571 gui/options.cpp:771 +#: gui/options.cpp:236 gui/options.cpp:464 gui/options.cpp:559 +#: gui/options.cpp:625 gui/options.cpp:825 msgctxt "soundfont" msgid "None" msgstr "Не заданий" -#: gui/options.cpp:651 +#: gui/options.cpp:372 +msgid "Failed to apply some of the graphic options changes:" +msgstr "" + +#: gui/options.cpp:384 +msgid "the video mode could not be changed." +msgstr "" + +#: gui/options.cpp:390 +msgid "the fullscreen setting could not be changed" +msgstr "" + +#: gui/options.cpp:396 +msgid "the aspect ratio setting could not be changed" +msgstr "" + +#: gui/options.cpp:705 msgid "Graphics mode:" msgstr "Графічн. режим:" -#: gui/options.cpp:662 +#: gui/options.cpp:716 msgid "Render mode:" msgstr "Режим раструв.:" -#: gui/options.cpp:662 gui/options.cpp:663 +#: gui/options.cpp:716 gui/options.cpp:717 msgid "Special dithering modes supported by some games" msgstr "Спеціальні режими растрування, які підтримують деякі ігри" -#: gui/options.cpp:672 +#: gui/options.cpp:726 backends/graphics/sdl/sdl-graphics.cpp:2252 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:456 msgid "Fullscreen mode" msgstr "Повноекранний режим" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Aspect ratio correction" msgstr "Корекція співвідношення сторін" -#: gui/options.cpp:675 +#: gui/options.cpp:729 msgid "Correct aspect ratio for 320x200 games" msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "EGA undithering" msgstr "EGA без растрування" -#: gui/options.cpp:676 +#: gui/options.cpp:730 msgid "Enable undithering in EGA games that support it" msgstr "Вімкнути без растрування в EGA іграх які підтримують це" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Preferred Device:" msgstr "Головн. пристрій:" -#: gui/options.cpp:684 +#: gui/options.cpp:738 msgid "Music Device:" msgstr "Музич. пристрій:" -#: gui/options.cpp:684 gui/options.cpp:686 +#: gui/options.cpp:738 gui/options.cpp:740 msgid "Specifies preferred sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:684 gui/options.cpp:686 gui/options.cpp:687 +#: gui/options.cpp:738 gui/options.cpp:740 gui/options.cpp:741 msgid "Specifies output sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Реком. пристрій:" -#: gui/options.cpp:686 +#: gui/options.cpp:740 msgctxt "lowres" msgid "Music Device:" msgstr "Музичний пристрій:" -#: gui/options.cpp:712 +#: gui/options.cpp:766 msgid "AdLib emulator:" msgstr "Емулятор AdLib:" -#: gui/options.cpp:712 gui/options.cpp:713 +#: gui/options.cpp:766 gui/options.cpp:767 msgid "AdLib is used for music in many games" msgstr "Звукова карта AdLib використовується багатьма іграми" -#: gui/options.cpp:723 +#: gui/options.cpp:777 msgid "Output rate:" msgstr "Вихідна частота:" -#: gui/options.cpp:723 gui/options.cpp:724 +#: gui/options.cpp:777 gui/options.cpp:778 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -645,63 +661,63 @@ msgstr "" "Великі значення задають кращу якість звуку, проте вони можуть не " "підтримуватися вашою звуковою картою" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "GM Device:" msgstr "Пристрій GM:" -#: gui/options.cpp:734 +#: gui/options.cpp:788 msgid "Specifies default sound device for General MIDI output" msgstr "Вказує вихідний звуковий пристрій для MIDI" -#: gui/options.cpp:745 +#: gui/options.cpp:799 msgid "Don't use General MIDI music" msgstr "Не використовувати General MIDI музику" -#: gui/options.cpp:756 gui/options.cpp:817 +#: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" msgstr "Використовувати перший наявний пристрій" -#: gui/options.cpp:768 +#: gui/options.cpp:822 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:768 gui/options.cpp:770 gui/options.cpp:771 +#: gui/options.cpp:822 gui/options.cpp:824 gui/options.cpp:825 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont підтримується деякими звуковими картами, Fluidsynth і Timidity" -#: gui/options.cpp:770 +#: gui/options.cpp:824 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Mixed AdLib/MIDI mode" msgstr "Змішаний режим AdLib/MIDI" -#: gui/options.cpp:775 +#: gui/options.cpp:829 msgid "Use both MIDI and AdLib sound generation" msgstr "Використовувати і MIDI і AdLib для генерації звуку" -#: gui/options.cpp:778 +#: gui/options.cpp:832 msgid "MIDI gain:" msgstr "Посилення MIDI:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "MT-32 Device:" msgstr "Пристрій MT-32:" -#: gui/options.cpp:788 +#: gui/options.cpp:842 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Вказує звуковий пристрій по умовчанню для виводу на Roland MT-32/LAPC1/CM32l/" "CM64" -#: gui/options.cpp:793 +#: gui/options.cpp:847 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:793 gui/options.cpp:795 +#: gui/options.cpp:847 gui/options.cpp:849 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -709,193 +725,194 @@ msgstr "" "Відмітьте, якщо у вас підключений Roland-сумісний звуковий пристрій і ви " "хочете його використати" -#: gui/options.cpp:795 +#: gui/options.cpp:849 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Enable Roland GS Mode" msgstr "Увімкнути режим Roland GS" -#: gui/options.cpp:798 +#: gui/options.cpp:852 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Вимикає мапінг General MIDI для ігор із звуковою доріжкою для Roland MT-32" -#: gui/options.cpp:807 +#: gui/options.cpp:861 msgid "Don't use Roland MT-32 music" msgstr "Не використовувати Roland MT-32" -#: gui/options.cpp:834 +#: gui/options.cpp:888 msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:838 gui/options.cpp:848 +#: gui/options.cpp:892 gui/options.cpp:902 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:839 gui/options.cpp:849 +#: gui/options.cpp:893 gui/options.cpp:903 msgid "Subtitles" msgstr "Субтитри" -#: gui/options.cpp:840 +#: gui/options.cpp:894 msgid "Both" msgstr "Все" -#: gui/options.cpp:842 +#: gui/options.cpp:896 msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:844 +#: gui/options.cpp:898 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:848 +#: gui/options.cpp:902 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:849 +#: gui/options.cpp:903 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgctxt "lowres" msgid "Both" msgstr "Все" -#: gui/options.cpp:850 +#: gui/options.cpp:904 msgid "Show subtitles and play speech" msgstr "Показувати субтитри і відтворювати мову" -#: gui/options.cpp:852 +#: gui/options.cpp:906 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:868 +#: gui/options.cpp:922 msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:870 +#: gui/options.cpp:924 msgctxt "lowres" msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:877 +#: gui/options.cpp:931 msgid "Mute All" msgstr "Вимкнути все" -#: gui/options.cpp:880 +#: gui/options.cpp:934 msgid "SFX volume:" msgstr "Гучність ефектів:" -#: gui/options.cpp:880 gui/options.cpp:882 gui/options.cpp:883 +#: gui/options.cpp:934 gui/options.cpp:936 gui/options.cpp:937 msgid "Special sound effects volume" msgstr "Гучність спеціальних звукових ефектів" -#: gui/options.cpp:882 +#: gui/options.cpp:936 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучніс. ефектів:" -#: gui/options.cpp:890 +#: gui/options.cpp:944 msgid "Speech volume:" msgstr "Гучність озвучки:" -#: gui/options.cpp:892 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучніс. озвучки:" -#: gui/options.cpp:1031 +#: gui/options.cpp:1085 msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1033 +#: gui/options.cpp:1087 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1037 gui/options.cpp:1039 gui/options.cpp:1040 +#: gui/options.cpp:1091 gui/options.cpp:1093 gui/options.cpp:1094 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Вказує шлях до додаткових файлів даних, використовуваних усіма іграми або " "ScummVM" -#: gui/options.cpp:1044 +#: gui/options.cpp:1098 msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1046 +#: gui/options.cpp:1100 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1055 +#: gui/options.cpp:1109 msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1057 +#: gui/options.cpp:1111 msgctxt "lowres" msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1059 +#: gui/options.cpp:1113 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1063 +#: gui/options.cpp:1117 msgid "GUI Renderer:" msgstr "Растер. GUI:" -#: gui/options.cpp:1075 +#: gui/options.cpp:1129 msgid "Autosave:" msgstr "Автозбереження:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1131 msgctxt "lowres" msgid "Autosave:" msgstr "Автозбереж.:" -#: gui/options.cpp:1085 +#: gui/options.cpp:1139 msgid "Keys" msgstr "Клавіші" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "GUI Language:" msgstr "Мова інтерф.:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1146 msgid "Language of ScummVM GUI" msgstr "Мова графічного інтерфейсу ScummVM" -#: gui/options.cpp:1241 -msgid "You have to restart ScummVM to take the effect." +#: gui/options.cpp:1295 +#, fuzzy +msgid "You have to restart ScummVM before your changes will take effect." msgstr "Ви повинні перезапустити ScummVM щоб застосувати зміни." -#: gui/options.cpp:1254 +#: gui/options.cpp:1308 msgid "Select directory for savegames" msgstr "Виберіть папку для збережень" -#: gui/options.cpp:1261 +#: gui/options.cpp:1315 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу." -#: gui/options.cpp:1270 +#: gui/options.cpp:1324 msgid "Select directory for GUI themes" msgstr "Виберіть папку для тем GUI" -#: gui/options.cpp:1280 +#: gui/options.cpp:1334 msgid "Select directory for extra files" msgstr "Виберіть папку з додатковими файлами" -#: gui/options.cpp:1291 +#: gui/options.cpp:1345 msgid "Select directory for plugins" msgstr "Виберіть папку зі втулками" -#: gui/options.cpp:1335 +#: gui/options.cpp:1389 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." @@ -903,779 +920,804 @@ msgstr "" "Вибрана тема не підтримує поточну мову. Якщо ви хочете використовувати цю " "тему, потрібно в першу чергу змінити мову." -#: gui/saveload.cpp:61 gui/saveload.cpp:242 +#: gui/saveload.cpp:58 gui/saveload.cpp:239 msgid "No date saved" msgstr "Дата не записана" -#: gui/saveload.cpp:62 gui/saveload.cpp:243 +#: gui/saveload.cpp:59 gui/saveload.cpp:240 msgid "No time saved" msgstr "Час не записаний" -#: gui/saveload.cpp:63 gui/saveload.cpp:244 +#: gui/saveload.cpp:60 gui/saveload.cpp:241 msgid "No playtime saved" msgstr "Час гри не записано" -#: gui/saveload.cpp:70 gui/saveload.cpp:158 +#: gui/saveload.cpp:67 gui/saveload.cpp:155 msgid "Delete" msgstr "Видалити" -#: gui/saveload.cpp:157 +#: gui/saveload.cpp:154 msgid "Do you really want to delete this savegame?" msgstr "Ви дійсно хочете видалити це збереження?" -#: gui/saveload.cpp:266 +#: gui/saveload.cpp:263 msgid "Date: " msgstr "Дата: " -#: gui/saveload.cpp:269 +#: gui/saveload.cpp:266 msgid "Time: " msgstr "Час: " -#: gui/saveload.cpp:274 +#: gui/saveload.cpp:271 msgid "Playtime: " msgstr "Час гри: " -#: gui/saveload.cpp:287 gui/saveload.cpp:354 +#: gui/saveload.cpp:284 gui/saveload.cpp:351 msgid "Untitled savestate" msgstr "Збереження без імені" -#: gui/themebrowser.cpp:47 +#: gui/themebrowser.cpp:44 msgid "Select a Theme" msgstr "Виберіть тему" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgid "Disabled GFX" msgstr "Без графіки" -#: gui/ThemeEngine.cpp:332 +#: gui/ThemeEngine.cpp:327 msgctxt "lowres" msgid "Disabled GFX" msgstr "Без графіки" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard Renderer (16bpp)" msgstr "Стандартний растеризатор (16bpp)" -#: gui/ThemeEngine.cpp:333 +#: gui/ThemeEngine.cpp:328 msgid "Standard (16bpp)" msgstr "Стандартний растеризатор (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased Renderer (16bpp)" msgstr "Растеризатор зі згладжуванням (16bpp)" -#: gui/ThemeEngine.cpp:335 +#: gui/ThemeEngine.cpp:330 msgid "Antialiased (16bpp)" msgstr "Растеризатор зі згладжуванням (16bpp)" -#: base/main.cpp:201 +#: base/main.cpp:200 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Движок не підтримує рівень відладки '%s'" -#: base/main.cpp:269 +#: base/main.cpp:268 msgid "Menu" msgstr "Меню" -#: base/main.cpp:272 backends/platform/symbian/src/SymbianActions.cpp:48 -#: backends/platform/wince/CEActionsPocket.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:49 +#: base/main.cpp:271 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:275 backends/platform/symbian/src/SymbianActions.cpp:53 -#: backends/platform/wince/CEActionsPocket.cpp:45 +#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Пауза" -#: base/main.cpp:278 +#: base/main.cpp:277 msgid "Skip line" msgstr "Пропустити рядок" -#: base/main.cpp:433 +#: base/main.cpp:432 msgid "Error running game:" msgstr "Помилка запуску гри:" -#: base/main.cpp:457 +#: base/main.cpp:456 msgid "Could not find any engine capable of running the selected game" msgstr "Не можу знайти движок для запуску вибраної гри" -#: common/error.cpp:42 +#: common/error.cpp:38 msgid "No error" msgstr "Немає помилки" -#: common/error.cpp:44 +#: common/error.cpp:40 msgid "Game data not found" msgstr "Немає файлів гри" -#: common/error.cpp:46 +#: common/error.cpp:42 msgid "Game id not supported" msgstr "Game Id не підтримується" -#: common/error.cpp:48 +#: common/error.cpp:44 msgid "Unsupported color mode" msgstr "Режим кольору не підтримується" -#: common/error.cpp:51 +#: common/error.cpp:47 msgid "Read permission denied" msgstr "Недостатньо прав для читання" -#: common/error.cpp:53 +#: common/error.cpp:49 msgid "Write permission denied" msgstr "Недостатньо прав для запису" -#: common/error.cpp:56 +#: common/error.cpp:52 msgid "Path does not exist" msgstr "Шлях не знайдено" -#: common/error.cpp:58 +#: common/error.cpp:54 msgid "Path not a directory" msgstr "Шлях не є папкою" -#: common/error.cpp:60 +#: common/error.cpp:56 msgid "Path not a file" msgstr "Шлях не є файлом" -#: common/error.cpp:63 +#: common/error.cpp:59 msgid "Cannot create file" msgstr "Не можу створити файл" -#: common/error.cpp:65 +#: common/error.cpp:61 msgid "Reading data failed" msgstr "Помилка читання" -#: common/error.cpp:67 +#: common/error.cpp:63 msgid "Writing data failed" msgstr "Помилка запису даних" -#: common/error.cpp:70 +#: common/error.cpp:66 msgid "Could not find suitable engine plugin" msgstr "Не можу знайти необхідеого втулка для движка." -#: common/error.cpp:72 +#: common/error.cpp:68 msgid "Engine plugin does not support save states" msgstr "Движок не підтримує рівень відладки '%s'" -#: common/error.cpp:75 -msgid "Command line argument not processed" -msgstr "Аргументи командного рядку не оброблені" - -#: common/error.cpp:79 +#: common/error.cpp:72 msgid "Unknown error" msgstr "Невідома помилка" -#: common/util.cpp:276 +#: common/util.cpp:274 msgid "Hercules Green" msgstr "Hercules Зелений" -#: common/util.cpp:277 +#: common/util.cpp:275 msgid "Hercules Amber" msgstr "Hercules Янтарний" -#: common/util.cpp:284 +#: common/util.cpp:282 msgctxt "lowres" msgid "Hercules Green" msgstr "Hercules Зелений" -#: common/util.cpp:285 +#: common/util.cpp:283 msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Янтарний" -#: engines/dialogs.cpp:87 +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + +#: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "Продов~ж~ити" -#: engines/dialogs.cpp:89 +#: engines/dialogs.cpp:86 msgid "~L~oad" msgstr "~З~авантажити" -#: engines/dialogs.cpp:93 +#: engines/dialogs.cpp:90 msgid "~S~ave" msgstr "~З~аписати" -#: engines/dialogs.cpp:97 +#: engines/dialogs.cpp:94 msgid "~O~ptions" msgstr "~О~пції" -#: engines/dialogs.cpp:102 +#: engines/dialogs.cpp:99 msgid "~H~elp" msgstr "~Д~опомога" -#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:101 msgid "~A~bout" msgstr "Про про~г~раму" -#: engines/dialogs.cpp:107 engines/dialogs.cpp:185 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 msgid "~R~eturn to Launcher" msgstr "~П~овер. в головне меню" -#: engines/dialogs.cpp:109 engines/dialogs.cpp:187 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~П~овер.в головне меню" -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 msgid "Save game:" msgstr "Зберегти гру: " -#: engines/dialogs.cpp:119 engines/cruise/menu.cpp:216 -#: engines/sci/engine/kfile.cpp:577 -#: backends/platform/symbian/src/SymbianActions.cpp:47 -#: backends/platform/wince/CEActionsPocket.cpp:46 -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:48 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:575 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Записати" -#: engines/dialogs.cpp:315 engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:130 +#: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 +#: engines/mohawk/dialogs.cpp:152 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:93 -#: engines/mohawk/dialogs.cpp:131 +#: engines/dialogs.cpp:313 engines/mohawk/dialogs.cpp:101 +#: engines/mohawk/dialogs.cpp:153 msgid "~C~ancel" msgstr "Ві~д~міна" -#: engines/dialogs.cpp:319 +#: engines/dialogs.cpp:316 msgid "~K~eys" msgstr "~К~лавіші" -#: engines/scumm/dialogs.cpp:284 +#: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~П~опер" -#: engines/scumm/dialogs.cpp:285 +#: engines/scumm/dialogs.cpp:282 msgid "~N~ext" msgstr "~Н~аст" -#: engines/scumm/dialogs.cpp:286 -#: backends/platform/ds/arm9/source/dsoptions.cpp:59 +#: engines/scumm/dialogs.cpp:283 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 msgid "~C~lose" msgstr "~З~акрити" -#: engines/scumm/help.cpp:76 +#: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" msgstr "Основні команди клавіатури:" -#: engines/scumm/help.cpp:77 +#: engines/scumm/help.cpp:74 msgid "Save / Load dialog" msgstr "Діалог збереження/завантаження" -#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:76 msgid "Skip line of text" msgstr "Пропустити рядок тексту" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Esc" msgstr "Esc" -#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:77 msgid "Skip cutscene" msgstr "Пропустити заставку" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Space" msgstr "Space" -#: engines/scumm/help.cpp:81 +#: engines/scumm/help.cpp:78 msgid "Pause game" msgstr "Пауза" -#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" -#: engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:79 msgid "Load game state 1-10" msgstr "Завантажити стан гри 1-10" -#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:87 -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:103 -#: engines/scumm/help.cpp:104 engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" -#: engines/scumm/help.cpp:83 +#: engines/scumm/help.cpp:80 msgid "Save game state 1-10" msgstr "Зберегти стан гри 1-10" -#: engines/scumm/help.cpp:85 engines/scumm/help.cpp:87 -#: backends/platform/symbian/src/SymbianActions.cpp:55 -#: backends/platform/wince/CEActionsPocket.cpp:47 -#: backends/platform/wince/CEActionsSmartphone.cpp:55 +#: engines/scumm/help.cpp:82 engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 msgid "Quit" msgstr "Вихід" -#: engines/scumm/help.cpp:89 engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 msgid "Toggle fullscreen" msgstr "Увімкнути повноекранний режим" -#: engines/scumm/help.cpp:90 +#: engines/scumm/help.cpp:87 msgid "Music volume up / down" msgstr "Гучність музики вище/нижче" -#: engines/scumm/help.cpp:91 +#: engines/scumm/help.cpp:88 msgid "Text speed slower / faster" msgstr "Швидкість тексту повільніше/швидше" -#: engines/scumm/help.cpp:92 +#: engines/scumm/help.cpp:89 msgid "Simulate left mouse button" msgstr "Симулювати лівий клік" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Tab" msgstr "Tab" -#: engines/scumm/help.cpp:93 +#: engines/scumm/help.cpp:90 msgid "Simulate right mouse button" msgstr "Симулювати правий клік" -#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:93 msgid "Special keyboard commands:" msgstr "Спеціальні команди клавіатури:" -#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:94 msgid "Show / Hide console" msgstr "Показати/cховати консоль" -#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:95 msgid "Start the debugger" msgstr "Запуск відладчика" -#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:96 msgid "Show memory consumption" msgstr "Показати споживання пам'яті" -#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:97 msgid "Run in fast mode (*)" msgstr "Виконати в швидкому режимі (*)" -#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:98 msgid "Run in really fast mode (*)" msgstr "Виконати в дійсно швидкому режимі (*)" -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:99 msgid "Toggle mouse capture" msgstr "Увімкнути захоплення миші" -#: engines/scumm/help.cpp:103 +#: engines/scumm/help.cpp:100 msgid "Switch between graphics filters" msgstr "Переключення між графічними фільтрами" -#: engines/scumm/help.cpp:104 +#: engines/scumm/help.cpp:101 msgid "Increase / Decrease scale factor" msgstr "Збільшення/зменшення масштабу" -#: engines/scumm/help.cpp:105 +#: engines/scumm/help.cpp:102 msgid "Toggle aspect-ratio correction" msgstr "Корекція співвідношення сторін" -#: engines/scumm/help.cpp:110 +#: engines/scumm/help.cpp:107 msgid "* Note that using ctrl-f and" msgstr "* Зауважимо, що використання ctrl-f і" -#: engines/scumm/help.cpp:111 +#: engines/scumm/help.cpp:108 msgid " ctrl-g are not recommended" msgstr " ctrl-g не рекомендується" -#: engines/scumm/help.cpp:112 +#: engines/scumm/help.cpp:109 msgid " since they may cause crashes" msgstr " оскільки вони можуть викликати збої" -#: engines/scumm/help.cpp:113 -msgid " or incorrect game behaviour." +#: engines/scumm/help.cpp:110 +#, fuzzy +msgid " or incorrect game behavior." msgstr " або неправильну поведінку гри." -#: engines/scumm/help.cpp:117 +#: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" msgstr "Змінні чорновики на клавіатурі:" -#: engines/scumm/help.cpp:119 +#: engines/scumm/help.cpp:116 msgid "Main game controls:" msgstr "Основні опції керування:" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 msgid "Push" msgstr "Натиск" -#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Тягти" -#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:206 msgid "Give" msgstr "Дати" -#: engines/scumm/help.cpp:127 engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:189 +#: engines/scumm/help.cpp:207 msgid "Open" msgstr "Відкрити" -#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:126 msgid "Go to" msgstr "Йти до" -#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:127 msgid "Get" msgstr "Отримати" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:155 -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:200 -#: engines/scumm/help.cpp:215 engines/scumm/help.cpp:226 -#: engines/scumm/help.cpp:251 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:212 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:248 msgid "Use" msgstr "Використати" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Читати" -#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:150 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Нова дитина" -#: engines/scumm/help.cpp:134 engines/scumm/help.cpp:156 -#: engines/scumm/help.cpp:174 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Увімкнути" -#: engines/scumm/help.cpp:135 engines/scumm/help.cpp:157 -#: engines/scumm/help.cpp:175 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Вимкнути" -#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:193 msgid "Walk to" msgstr "Іти до" -#: engines/scumm/help.cpp:146 engines/scumm/help.cpp:171 -#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:212 -#: engines/scumm/help.cpp:229 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:209 +#: engines/scumm/help.cpp:226 msgid "Pick up" msgstr "Підібрати" -#: engines/scumm/help.cpp:147 engines/scumm/help.cpp:172 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Що є" -#: engines/scumm/help.cpp:149 +#: engines/scumm/help.cpp:146 msgid "Unlock" msgstr "Розблокувати" -#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:149 msgid "Put on" msgstr "Поставити на" -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:150 msgid "Take off" msgstr "Зняти" -#: engines/scumm/help.cpp:159 +#: engines/scumm/help.cpp:156 msgid "Fix" msgstr "Налагодити" -#: engines/scumm/help.cpp:161 +#: engines/scumm/help.cpp:158 msgid "Switch" msgstr "Перемкнути" -#: engines/scumm/help.cpp:169 engines/scumm/help.cpp:230 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:227 msgid "Look" msgstr "Глянути" -#: engines/scumm/help.cpp:176 engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:222 msgid "Talk" msgstr "Говорити" -#: engines/scumm/help.cpp:177 +#: engines/scumm/help.cpp:174 msgid "Travel" msgstr "Подорож" -#: engines/scumm/help.cpp:178 +#: engines/scumm/help.cpp:175 msgid "To Henry / To Indy" msgstr "У Генрі / У Інді" -#: engines/scumm/help.cpp:181 +#: engines/scumm/help.cpp:178 msgid "play C minor on distaff" msgstr "грати до мінор на прядці" -#: engines/scumm/help.cpp:182 +#: engines/scumm/help.cpp:179 msgid "play D on distaff" msgstr "грати ре на прядці" -#: engines/scumm/help.cpp:183 +#: engines/scumm/help.cpp:180 msgid "play E on distaff" msgstr "грати мі на прядці" -#: engines/scumm/help.cpp:184 +#: engines/scumm/help.cpp:181 msgid "play F on distaff" msgstr "грати фа на прядці" -#: engines/scumm/help.cpp:185 +#: engines/scumm/help.cpp:182 msgid "play G on distaff" msgstr "грати соль на прядці" -#: engines/scumm/help.cpp:186 +#: engines/scumm/help.cpp:183 msgid "play A on distaff" msgstr "грати ля на прядці" -#: engines/scumm/help.cpp:187 +#: engines/scumm/help.cpp:184 msgid "play B on distaff" msgstr "грати сі на прядці" -#: engines/scumm/help.cpp:188 +#: engines/scumm/help.cpp:185 msgid "play C major on distaff" msgstr "грати до мажор на прядці" -#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:213 msgid "puSh" msgstr "Поштовх" -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:217 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "pull (Yank)" msgstr "тягнути (Смикнути)" -#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:214 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:246 msgid "Talk to" msgstr "Говорити до" -#: engines/scumm/help.cpp:201 engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:198 engines/scumm/help.cpp:210 msgid "Look at" msgstr "Глянути на" -#: engines/scumm/help.cpp:202 +#: engines/scumm/help.cpp:199 msgid "turn oN" msgstr "Увімкнути" -#: engines/scumm/help.cpp:203 +#: engines/scumm/help.cpp:200 msgid "turn oFf" msgstr "Вимкнути" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "KeyUp" msgstr "Натиснути" -#: engines/scumm/help.cpp:219 +#: engines/scumm/help.cpp:216 msgid "Highlight prev dialogue" msgstr "Виділити попередній діалог" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "KeyDown" msgstr "Відпустити" -#: engines/scumm/help.cpp:220 +#: engines/scumm/help.cpp:217 msgid "Highlight next dialogue" msgstr "Виділити наступний діалог" -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:221 msgid "Walk" msgstr "Іти" -#: engines/scumm/help.cpp:227 engines/scumm/help.cpp:236 -#: engines/scumm/help.cpp:243 engines/scumm/help.cpp:250 +#: engines/scumm/help.cpp:224 engines/scumm/help.cpp:233 +#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:247 msgid "Inventory" msgstr "Інвентар" -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:225 msgid "Object" msgstr "Об'єкт" -#: engines/scumm/help.cpp:231 +#: engines/scumm/help.cpp:228 msgid "Black and White / Color" msgstr "Чорнобілий/Кольоровий" -#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:231 msgid "Eyes" msgstr "Очі" -#: engines/scumm/help.cpp:235 +#: engines/scumm/help.cpp:232 msgid "Tongue" msgstr "Розмовляти" -#: engines/scumm/help.cpp:237 +#: engines/scumm/help.cpp:234 msgid "Punch" msgstr "Вдарити кулаком" -#: engines/scumm/help.cpp:238 +#: engines/scumm/help.cpp:235 msgid "Kick" msgstr "Вдарити ногою" -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:248 +#: engines/scumm/help.cpp:238 engines/scumm/help.cpp:245 msgid "Examine" msgstr "Розглянути" -#: engines/scumm/help.cpp:242 +#: engines/scumm/help.cpp:239 msgid "Regular cursor" msgstr "Звичайний курсор" -#: engines/scumm/help.cpp:244 +#: engines/scumm/help.cpp:241 msgid "Comm" msgstr "Comm" -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:244 msgid "Save / Load / Options" msgstr "Збереження / Завантаження / Опції" -#: engines/scumm/help.cpp:256 +#: engines/scumm/help.cpp:253 msgid "Other game controls:" msgstr "Інші опції керування:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:255 engines/scumm/help.cpp:265 msgid "Inventory:" msgstr "Інвентар:" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:256 engines/scumm/help.cpp:272 msgid "Scroll list up" msgstr "Прокручення списку догори" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:273 msgid "Scroll list down" msgstr "Прокручення списку донизу" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:266 msgid "Upper left item" msgstr "Верхня зліва річ" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:268 msgid "Lower left item" msgstr "Нижня зліва річ" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:269 msgid "Upper right item" msgstr "Верхня справа річ" -#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:271 msgid "Lower right item" msgstr "Нижня справа річ" -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:267 msgid "Middle left item" msgstr "Середня зліва річ" -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:270 msgid "Middle right item" msgstr "Середня справа річ" -#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285 +#: engines/scumm/help.cpp:277 engines/scumm/help.cpp:282 msgid "Switching characters:" msgstr "Переключення героїв" -#: engines/scumm/help.cpp:282 +#: engines/scumm/help.cpp:279 msgid "Second kid" msgstr "Друга дитина" -#: engines/scumm/help.cpp:283 +#: engines/scumm/help.cpp:280 msgid "Third kid" msgstr "Третя дитина" -#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:292 msgid "Fighting controls (numpad):" msgstr "Керування бійкою (numpad):" -#: engines/scumm/help.cpp:296 engines/scumm/help.cpp:297 -#: engines/scumm/help.cpp:298 +#: engines/scumm/help.cpp:293 engines/scumm/help.cpp:294 +#: engines/scumm/help.cpp:295 msgid "Step back" msgstr "Крок назад" -#: engines/scumm/help.cpp:299 +#: engines/scumm/help.cpp:296 msgid "Block high" msgstr "Блокувати вище" -#: engines/scumm/help.cpp:300 +#: engines/scumm/help.cpp:297 msgid "Block middle" msgstr "Блокувати посередині" -#: engines/scumm/help.cpp:301 +#: engines/scumm/help.cpp:298 msgid "Block low" msgstr "Блокувати нижче" -#: engines/scumm/help.cpp:302 +#: engines/scumm/help.cpp:299 msgid "Punch high" msgstr "Бити вище" -#: engines/scumm/help.cpp:303 +#: engines/scumm/help.cpp:300 msgid "Punch middle" msgstr "Бити посередині" -#: engines/scumm/help.cpp:304 +#: engines/scumm/help.cpp:301 msgid "Punch low" msgstr "Бити нижче" -#: engines/scumm/help.cpp:307 +#: engines/scumm/help.cpp:304 msgid "These are for Indy on left." msgstr "У випадку для Інді зліва." -#: engines/scumm/help.cpp:308 +#: engines/scumm/help.cpp:305 msgid "When Indy is on the right," msgstr "Коли Інді є справа," -#: engines/scumm/help.cpp:309 +#: engines/scumm/help.cpp:306 msgid "7, 4, and 1 are switched with" msgstr "7, 4, і 1 перемикаються на" -#: engines/scumm/help.cpp:310 +#: engines/scumm/help.cpp:307 msgid "9, 6, and 3, respectively." msgstr "9, 6 і 3 відповідно." -#: engines/scumm/help.cpp:317 +#: engines/scumm/help.cpp:314 msgid "Biplane controls (numpad):" msgstr "Керування біпланом (numpad):" -#: engines/scumm/help.cpp:318 +#: engines/scumm/help.cpp:315 msgid "Fly to upper left" msgstr "Летіти догори наліво" -#: engines/scumm/help.cpp:319 +#: engines/scumm/help.cpp:316 msgid "Fly to left" msgstr "Летіти наліво" -#: engines/scumm/help.cpp:320 +#: engines/scumm/help.cpp:317 msgid "Fly to lower left" msgstr "Летіти нижче вліво" -#: engines/scumm/help.cpp:321 +#: engines/scumm/help.cpp:318 msgid "Fly upwards" msgstr "Летіти догори" -#: engines/scumm/help.cpp:322 +#: engines/scumm/help.cpp:319 msgid "Fly straight" msgstr "Летіти прямо" -#: engines/scumm/help.cpp:323 +#: engines/scumm/help.cpp:320 msgid "Fly down" msgstr "Летіти донизу" -#: engines/scumm/help.cpp:324 +#: engines/scumm/help.cpp:321 msgid "Fly to upper right" msgstr "Летіти догори направо" -#: engines/scumm/help.cpp:325 +#: engines/scumm/help.cpp:322 msgid "Fly to right" msgstr "Летіти направо" -#: engines/scumm/help.cpp:326 +#: engines/scumm/help.cpp:323 msgid "Fly to lower right" msgstr "Летіти донизу направо" -#: engines/scumm/scumm.cpp:2255 engines/agos/saveload.cpp:192 +#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1686,7 +1728,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2262 engines/agos/saveload.cpp:157 +#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1697,7 +1739,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2274 engines/agos/saveload.cpp:200 +#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1708,276 +1750,335 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2497 +#: engines/scumm/scumm.cpp:2484 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." msgstr "" -"Зазвичай, зараз би запустився Maniac Mansion. Проте ScummVM ще цього не вміє. " -"Щоб грати у нього, оберіть 'Додати гру' у початковому меню ScummVM, і виберіть " -"папку Maniac всередені пвпки з грою Tentacle." +"Зазвичай, зараз би запустився Maniac Mansion. Проте ScummVM ще цього не " +"вміє. Щоб грати у нього, оберіть 'Додати гру' у початковому меню ScummVM, і " +"виберіть папку Maniac всередені пвпки з грою Tentacle." -#: engines/mohawk/dialogs.cpp:89 engines/mohawk/dialogs.cpp:127 +#: engines/mohawk/dialogs.cpp:90 engines/mohawk/dialogs.cpp:149 msgid "~Z~ip Mode Activated" msgstr "Режим швидкого переходу активовано" -#: engines/mohawk/dialogs.cpp:90 +#: engines/mohawk/dialogs.cpp:91 msgid "~T~ransitions Enabled" msgstr "Переходи активовано" -#: engines/mohawk/dialogs.cpp:128 +#: engines/mohawk/dialogs.cpp:92 +msgid "~D~rop Page" +msgstr "" + +#: engines/mohawk/dialogs.cpp:96 +msgid "~S~how Map" +msgstr "" + +#: engines/mohawk/dialogs.cpp:150 msgid "~W~ater Effect Enabled" msgstr "Ефекти води включено" -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore game:" msgstr "Відновити гру: " -#: engines/sci/engine/kfile.cpp:680 +#: engines/sci/engine/kfile.cpp:678 msgid "Restore" msgstr "Відновити" -#: audio/fmopl.cpp:51 +#: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Емулятор MAME OPL:" -#: audio/fmopl.cpp:53 +#: audio/fmopl.cpp:51 msgid "DOSBox OPL emulator" msgstr "Емулятор DOSBox OPL" -#: audio/null.h:46 +#: audio/mididrv.cpp:206 +#, c-format +msgid "" +"Failed to detect the selected audio device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:246 +#, c-format +msgid "" +"Failed to detect the preferred device '%s'. See log file for more " +"information. Attempting to fall back to the next available device..." +msgstr "" + +#: audio/null.h:43 msgid "No music" msgstr "Без музики" -#: audio/mods/paula.cpp:192 +#: audio/mods/paula.cpp:189 msgid "Amiga Audio Emulator" msgstr "Аміга Аудіо Емулятор" -#: audio/softsynth/adlib.cpp:1590 +#: audio/softsynth/adlib.cpp:1594 msgid "AdLib Emulator" msgstr "Емулятор AdLib" -#: audio/softsynth/appleiigs.cpp:36 +#: audio/softsynth/appleiigs.cpp:33 msgid "Apple II GS Emulator (NOT IMPLEMENTED)" msgstr "Apple II GS Емулятор (НЕ РЕАЛІЗОВАНО)" -#: audio/softsynth/sid.cpp:1434 +#: audio/softsynth/sid.cpp:1430 msgid "C64 Audio Emulator" msgstr "C64 Аудіо Емулятор" -#: audio/softsynth/mt32.cpp:326 -msgid "Initialising MT-32 Emulator" +#: audio/softsynth/mt32.cpp:329 +#, fuzzy +msgid "Initializing MT-32 Emulator" msgstr "Настроюю емулятор MT-32" -#: audio/softsynth/mt32.cpp:540 +#: audio/softsynth/mt32.cpp:543 msgid "MT-32 Emulator" msgstr "Емулятор MT-32" -#: audio/softsynth/pcspk.cpp:142 +#: audio/softsynth/pcspk.cpp:139 msgid "PC Speaker Emulator" msgstr "Емулятор PC спікера" -#: audio/softsynth/pcspk.cpp:161 +#: audio/softsynth/pcspk.cpp:158 msgid "IBM PCjr Emulator" msgstr "Емулятор IBM PCjr" -#: audio/softsynth/ym2612.cpp:762 -msgid "FM Towns Emulator" -msgstr "Емулятор FM Towns" - -#: backends/keymapper/remap-dialog.cpp:49 +#: backends/keymapper/remap-dialog.cpp:47 msgid "Keymap:" msgstr "Таблиця клавіш:" -#: backends/keymapper/remap-dialog.cpp:66 +#: backends/keymapper/remap-dialog.cpp:64 msgid " (Active)" msgstr " (Активна)" -#: backends/keymapper/remap-dialog.cpp:100 +#: backends/keymapper/remap-dialog.cpp:98 msgid " (Global)" msgstr " (Глобальна)" -#: backends/keymapper/remap-dialog.cpp:110 +#: backends/keymapper/remap-dialog.cpp:108 msgid " (Game)" msgstr " (Ігри)" -#: backends/midi/windows.cpp:165 +#: backends/midi/windows.cpp:164 msgid "Windows MIDI" msgstr "Windows MIDI" -#: backends/platform/ds/arm9/source/dsoptions.cpp:60 +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 msgid "ScummVM Main Menu" msgstr "Головне меню ScummVM" -#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 msgid "~L~eft handed mode" msgstr "Ліворукий режим" -#: backends/platform/ds/arm9/source/dsoptions.cpp:67 +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 msgid "~I~ndy fight controls" msgstr "Керування боями в Indy" -#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 msgid "Show mouse cursor" msgstr "Показувати курсор миші" -#: backends/platform/ds/arm9/source/dsoptions.cpp:69 +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 msgid "Snap to edges" msgstr "Прикріпити до країв" -#: backends/platform/ds/arm9/source/dsoptions.cpp:71 +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 msgid "Touch X Offset" msgstr "Зміщення дотиків по осі X" -#: backends/platform/ds/arm9/source/dsoptions.cpp:78 +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 msgid "Touch Y Offset" msgstr "Зміщення дотиків по осі Y" -#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 msgid "Use laptop trackpad-style cursor control" msgstr "Використовувати управління курсором як на трекпаді лаптопів" -#: backends/platform/ds/arm9/source/dsoptions.cpp:91 +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 msgid "Tap for left click, double tap right click" msgstr "Тап для лівого клацання, подвійний тап для правого клацання" -#: backends/platform/ds/arm9/source/dsoptions.cpp:93 +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 msgid "Sensitivity" msgstr "Чутливість" -#: backends/platform/ds/arm9/source/dsoptions.cpp:102 +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 msgid "Initial top screen scale:" msgstr "Початковий масштаб верхнього екрану:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 msgid "Main screen scaling:" msgstr "Масштаб головного екрану:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:110 +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 msgid "Hardware scale (fast, but low quality)" msgstr "Хардварне масштабування (швидко, але низької якості)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 msgid "Software scale (good quality, but slower)" msgstr "Програмне масштабування (хороша якість, але повільніше)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:112 +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 msgid "Unscaled (you must scroll left and right)" msgstr "Без масштабування (треба буде прокручувати наліво і направо)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:114 +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 msgid "Brightness:" msgstr "Яскравість:" -#: backends/platform/ds/arm9/source/dsoptions.cpp:124 +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 msgid "High quality audio (slower) (reboot)" msgstr "Висока якість звуку (повільніше) (ребут)" -#: backends/platform/ds/arm9/source/dsoptions.cpp:125 +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 msgid "Disable power off" msgstr "Заборонити вимкнення" -#: backends/platform/iphone/osys_events.cpp:360 +#: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Режим тачпаду увімкнено." -#: backends/platform/iphone/osys_events.cpp:362 +#: backends/platform/iphone/osys_events.cpp:353 msgid "Touchpad mode disabled." msgstr "Режим тачпаду вимкнено." -#: backends/graphics/sdl/sdl-graphics.cpp:47 +#: backends/graphics/sdl/sdl-graphics.cpp:45 msgid "Normal (no scaling)" msgstr "Без збільшення" -#: backends/graphics/sdl/sdl-graphics.cpp:66 +#: backends/graphics/sdl/sdl-graphics.cpp:64 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Без збільшення" -#: backends/graphics/opengl/opengl-graphics.cpp:133 +#: backends/graphics/sdl/sdl-graphics.cpp:2137 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:517 +#, fuzzy +msgid "Enabled aspect ratio correction" +msgstr "Корекція співвідношення сторін" + +#: backends/graphics/sdl/sdl-graphics.cpp:2143 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:522 +#, fuzzy +msgid "Disabled aspect ratio correction" +msgstr "Корекція співвідношення сторін" + +#: backends/graphics/sdl/sdl-graphics.cpp:2198 +#, fuzzy +msgid "Active graphics filter:" +msgstr "Переключення між графічними фільтрами" + +#: backends/graphics/sdl/sdl-graphics.cpp:2254 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:461 +#, fuzzy +msgid "Windowed mode" +msgstr "Режим раструв.:" + +#: backends/graphics/opengl/opengl-graphics.cpp:139 msgid "OpenGL Normal" msgstr "OpenGL нормальний" -#: backends/graphics/opengl/opengl-graphics.cpp:134 +#: backends/graphics/opengl/opengl-graphics.cpp:140 msgid "OpenGL Conserve" -msgstr "OpenGL збережений +msgstr "OpenGL збережений" -#: backends/graphics/opengl/opengl-graphics.cpp:135 +#: backends/graphics/opengl/opengl-graphics.cpp:141 msgid "OpenGL Original" msgstr "OpenGL оригінальний" -#: backends/platform/symbian/src/SymbianActions.cpp:41 -#: backends/platform/wince/CEActionsSmartphone.cpp:42 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:399 +#, fuzzy +msgid "Current display mode" +msgstr "Поточний відеорежим:" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:412 +msgid "Current scale" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 +msgid "Active filter mode: Linear" +msgstr "" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:544 +msgid "Active filter mode: Nearest" +msgstr "" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 msgid "Up" msgstr "Догори" -#: backends/platform/symbian/src/SymbianActions.cpp:42 -#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 msgid "Down" msgstr "Донизу" -#: backends/platform/symbian/src/SymbianActions.cpp:43 -#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 msgid "Left" msgstr "Наліво" -#: backends/platform/symbian/src/SymbianActions.cpp:44 -#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 msgid "Right" msgstr "Направо" -#: backends/platform/symbian/src/SymbianActions.cpp:45 -#: backends/platform/wince/CEActionsPocket.cpp:63 -#: backends/platform/wince/CEActionsSmartphone.cpp:46 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 msgid "Left Click" msgstr "Лівий клік" -#: backends/platform/symbian/src/SymbianActions.cpp:46 -#: backends/platform/wince/CEActionsSmartphone.cpp:47 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 msgid "Right Click" msgstr "Правий клік" -#: backends/platform/symbian/src/SymbianActions.cpp:49 -#: backends/platform/wince/CEActionsSmartphone.cpp:50 +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 msgid "Zone" msgstr "Зона" -#: backends/platform/symbian/src/SymbianActions.cpp:50 -#: backends/platform/wince/CEActionsPocket.cpp:57 -#: backends/platform/wince/CEActionsSmartphone.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 msgid "Multi Function" msgstr "Мультифункція" -#: backends/platform/symbian/src/SymbianActions.cpp:51 +#: backends/platform/symbian/src/SymbianActions.cpp:48 msgid "Swap character" msgstr "Змінити героя" -#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/symbian/src/SymbianActions.cpp:49 msgid "Skip text" msgstr "Пропустити текст" -#: backends/platform/symbian/src/SymbianActions.cpp:54 +#: backends/platform/symbian/src/SymbianActions.cpp:51 msgid "Fast mode" msgstr "Швидкий режим" -#: backends/platform/symbian/src/SymbianActions.cpp:56 +#: backends/platform/symbian/src/SymbianActions.cpp:53 msgid "Debugger" msgstr "Відладчик" -#: backends/platform/symbian/src/SymbianActions.cpp:57 +#: backends/platform/symbian/src/SymbianActions.cpp:54 msgid "Global menu" msgstr "Глобальне меню" -#: backends/platform/symbian/src/SymbianActions.cpp:58 +#: backends/platform/symbian/src/SymbianActions.cpp:55 msgid "Virtual keyboard" msgstr "Віртуальна клавіатура" -#: backends/platform/symbian/src/SymbianActions.cpp:59 +#: backends/platform/symbian/src/SymbianActions.cpp:56 msgid "Key mapper" msgstr "Призначення клавіш" -#: backends/events/symbiansdl/symbiansdl-events.cpp:187 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" msgstr "Ви хочете вийти?" @@ -2098,133 +2199,190 @@ msgid "Network down" msgstr "Мережу вимкнено" #: backends/platform/wii/options.cpp:178 -msgid "Initialising network" +#, fuzzy +msgid "Initializing network" msgstr "Налаштовую мережу" #: backends/platform/wii/options.cpp:182 -msgid "Timeout while initialising network" +#, fuzzy +msgid "Timeout while initializing network" msgstr "Час підключення до мережі вийшов" #: backends/platform/wii/options.cpp:186 -#, c-format -msgid "Network not initialised (%d)" +#, fuzzy, c-format +msgid "Network not initialized (%d)" msgstr "Мережу не налагоджено (%d)" -#: backends/platform/wince/CEActionsPocket.cpp:49 +#: backends/platform/wince/CEActionsPocket.cpp:46 msgid "Hide Toolbar" msgstr "Заховати панель інструментів" -#: backends/platform/wince/CEActionsPocket.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:47 msgid "Show Keyboard" msgstr "Показати клавіатуру" -#: backends/platform/wince/CEActionsPocket.cpp:51 +#: backends/platform/wince/CEActionsPocket.cpp:48 msgid "Sound on/off" msgstr "Звук увім/вимк" -#: backends/platform/wince/CEActionsPocket.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:49 msgid "Right click" msgstr "Правий клік" -#: backends/platform/wince/CEActionsPocket.cpp:53 +#: backends/platform/wince/CEActionsPocket.cpp:50 msgid "Show/Hide Cursor" msgstr "Показати/сховати курсор" -#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsPocket.cpp:51 msgid "Free look" msgstr "Вільний огляд" -#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" msgstr "Збіл. маштаб" -#: backends/platform/wince/CEActionsPocket.cpp:56 +#: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" msgstr "Змнш. маштаб" -#: backends/platform/wince/CEActionsPocket.cpp:58 -#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 msgid "Bind Keys" msgstr "Призначити клавіші" -#: backends/platform/wince/CEActionsPocket.cpp:59 +#: backends/platform/wince/CEActionsPocket.cpp:56 msgid "Cursor Up" msgstr "Курсор догори" -#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsPocket.cpp:57 msgid "Cursor Down" msgstr "Курсор донизу" -#: backends/platform/wince/CEActionsPocket.cpp:61 +#: backends/platform/wince/CEActionsPocket.cpp:58 msgid "Cursor Left" msgstr "Курсор наліво" -#: backends/platform/wince/CEActionsPocket.cpp:62 +#: backends/platform/wince/CEActionsPocket.cpp:59 msgid "Cursor Right" msgstr "Курсор направо" -#: backends/platform/wince/CEActionsPocket.cpp:268 -#: backends/platform/wince/CEActionsSmartphone.cpp:231 +#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Ви хочете завантажити або зберегти гру?" -#: backends/platform/wince/CEActionsPocket.cpp:330 -#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CEActionsPocket.cpp:327 +#: backends/platform/wince/CEActionsSmartphone.cpp:284 msgid " Are you sure you want to quit ? " msgstr " Ви упевнені, що хочете вийти? " -#: backends/platform/wince/CEActionsSmartphone.cpp:53 +#: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" msgstr "Клавіатура" -#: backends/platform/wince/CEActionsSmartphone.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:51 msgid "Rotate" msgstr "Повернути" -#: backends/platform/wince/CELauncherDialog.cpp:60 +#: backends/platform/wince/CELauncherDialog.cpp:54 msgid "Using SDL driver " msgstr "Використовую драйвер SDL " -#: backends/platform/wince/CELauncherDialog.cpp:64 +#: backends/platform/wince/CELauncherDialog.cpp:58 msgid "Display " msgstr "Показати " -#: backends/platform/wince/CELauncherDialog.cpp:106 +#: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" msgstr "Ви хочете здійснити автоматичний пошук?" -#: backends/platform/wince/wince-sdl.cpp:486 +#: backends/platform/wince/wince-sdl.cpp:485 msgid "Map right click action" msgstr "Перепризначення правого кліку" -#: backends/platform/wince/wince-sdl.cpp:490 +#: backends/platform/wince/wince-sdl.cpp:489 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Ви повинні призначити кнопку до дії 'Правий клік', щоб грати у цю гру" -#: backends/platform/wince/wince-sdl.cpp:499 +#: backends/platform/wince/wince-sdl.cpp:498 msgid "Map hide toolbar action" msgstr "Перепризначити дію 'Сховати Панель інстр.'" -#: backends/platform/wince/wince-sdl.cpp:503 +#: backends/platform/wince/wince-sdl.cpp:502 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Ви повинні перепризначити кнопку для дії 'Сховати Панель інстр.', щоб грати " "в цю гру" -#: backends/platform/wince/wince-sdl.cpp:512 +#: backends/platform/wince/wince-sdl.cpp:511 msgid "Map Zoom Up action (optional)" msgstr "Перепризначити дію Збільшення (необовязково)" -#: backends/platform/wince/wince-sdl.cpp:515 +#: backends/platform/wince/wince-sdl.cpp:514 msgid "Map Zoom Down action (optional)" msgstr "Перепризначити дію Зменшення (необовязково)" -#: backends/platform/wince/wince-sdl.cpp:523 +#: backends/platform/wince/wince-sdl.cpp:522 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Не забудьте перепризначити кнопку для дії 'Сховати Панель інстр.' щоб " "побачити весь інвентар" +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 +#: backends/events/gph/gph-events.cpp:367 +#: backends/events/gph/gph-events.cpp:410 +#: backends/events/openpandora/op-events.cpp:78 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 +#: backends/events/gph/gph-events.cpp:369 +#: backends/events/gph/gph-events.cpp:412 +#: backends/events/openpandora/op-events.cpp:80 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 +#: backends/events/gph/gph-events.cpp:371 +#: backends/events/gph/gph-events.cpp:414 +#: backends/events/openpandora/op-events.cpp:82 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 +#: backends/events/gph/gph-events.cpp:391 +#, fuzzy +msgid "Maximum Volume" +msgstr "Гучність" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 +#: backends/events/gph/gph-events.cpp:393 +msgid "Increasing Volume" +msgstr "" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 +#: backends/events/gph/gph-events.cpp:399 +#, fuzzy +msgid "Minimal Volume" +msgstr "Гучність" + +#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 +#: backends/events/gph/gph-events.cpp:401 +msgid "Decreasing Volume" +msgstr "" + +#~ msgid "Discovered %d new games." +#~ msgstr "Знайдено %d нових ігор." + +#~ msgid "Command line argument not processed" +#~ msgstr "Аргументи командного рядку не оброблені" + +#~ msgid "FM Towns Emulator" +#~ msgstr "Емулятор FM Towns" + #~ msgid "Invalid Path" #~ msgstr "Неправильний шлях" diff --git a/test/common/str.h b/test/common/str.h index 0dee16a493..2c563f3132 100644 --- a/test/common/str.h +++ b/test/common/str.h @@ -284,6 +284,19 @@ class StringTestSuite : public CxxTest::TestSuite TS_ASSERT_EQUALS(Common::normalizePath("foo/./bar", '/'), "foo/bar"); TS_ASSERT_EQUALS(Common::normalizePath("foo//./bar//", '/'), "foo/bar"); TS_ASSERT_EQUALS(Common::normalizePath("foo//.bar//", '/'), "foo/.bar"); + + TS_ASSERT_EQUALS(Common::normalizePath("..", '/'), ".."); + TS_ASSERT_EQUALS(Common::normalizePath("../", '/'), ".."); + TS_ASSERT_EQUALS(Common::normalizePath("/..", '/'), "/.."); + TS_ASSERT_EQUALS(Common::normalizePath("../bar", '/'), "../bar"); + TS_ASSERT_EQUALS(Common::normalizePath("foo//../", '/'), ""); + TS_ASSERT_EQUALS(Common::normalizePath("foo/../bar", '/'), "bar"); + TS_ASSERT_EQUALS(Common::normalizePath("foo//../bar//", '/'), "bar"); + TS_ASSERT_EQUALS(Common::normalizePath("foo//..bar//", '/'), "foo/..bar"); + + TS_ASSERT_EQUALS(Common::normalizePath("foo/../../bar//", '/'), "../bar"); + TS_ASSERT_EQUALS(Common::normalizePath("../foo/../bar", '/'), "../bar"); + TS_ASSERT_EQUALS(Common::normalizePath("../../foo/bar/", '/'), "../../foo/bar"); } void test_matchString() { |