diff options
260 files changed, 6573 insertions, 8022 deletions
diff --git a/Makefile.common b/Makefile.common index 2a92ba441c..bfbfd67fb8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -265,6 +265,9 @@ endif ifdef ENABLE_TOON DIST_FILES_ENGINEDATA+=toon.dat endif +ifdef ENABLE_WINTERMUTE +DIST_FILES_ENGINEDATA+=wintermute.zip +endif DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA)) # pred.dic is currently only used for the AGI engine diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp index 6f55d21839..a2d470cdbf 100644 --- a/audio/mods/maxtrax.cpp +++ b/audio/mods/maxtrax.cpp @@ -105,7 +105,7 @@ inline uint32 pow2Fixed(int32 val) { } #endif -} // End of namespace +} // End of anonymous namespace namespace Audio { @@ -1032,6 +1032,6 @@ void MaxTrax::outPutEvent(const Event &ev, int num) {} void MaxTrax::outPutScore(const Score &sc, int num) {} #endif // #ifndef NDEBUG -} // End of namespace Audio +} // End of namespace Audio #endif // #if defined(AUDIO_MODS_MAXTRAX_H) diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h index ffb176c241..8288aef186 100644 --- a/audio/mods/maxtrax.h +++ b/audio/mods/maxtrax.h @@ -214,6 +214,6 @@ private: static void outPutEvent(const Event &ev, int num = -1); static void outPutScore(const Score &sc, int num = -1); }; -} // End of namespace Audio +} // End of namespace Audio #endif // !defined(AUDIO_MODS_MAXTRAX_H) diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp index 2957529afc..5829ab5fda 100644 --- a/audio/mods/tfmx.cpp +++ b/audio/mods/tfmx.cpp @@ -1095,7 +1095,7 @@ int Tfmx::doSfx(uint16 sfxIndex, bool unlockChannel) { return -1; } -} // End of namespace Audio +} // End of namespace Audio // some debugging functions #if 0 diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h index ebe1172278..a8852d7963 100644 --- a/audio/mods/tfmx.h +++ b/audio/mods/tfmx.h @@ -273,6 +273,6 @@ private: void noteCommand(uint8 note, uint8 param1, uint8 param2, uint8 param3); }; -} // End of namespace Audio +} // End of namespace Audio #endif // !defined(AUDIO_MODS_TFMX_H) diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp index 6813363fd5..d9744924aa 100644 --- a/audio/softsynth/mt32.cpp +++ b/audio/softsynth/mt32.cpp @@ -204,11 +204,11 @@ int MidiDriver_MT32::open() { _initializing = true; debug(4, _s("Initializing MT-32 Emulator")); _controlFile = new Common::File(); - if (!_controlFile->open("MT32_CONTROL.ROM")) - error("Error opening MT32_CONTROL.ROM"); + if (!_controlFile->open("MT32_CONTROL.ROM") && !_controlFile->open("CM32L_CONTROL.ROM")) + error("Error opening MT32_CONTROL.ROM / CM32L_CONTROL.ROM"); _pcmFile = new Common::File(); - if (!_pcmFile->open("MT32_PCM.ROM")) - error("Error opening MT32_PCM.ROM"); + if (!_pcmFile->open("MT32_PCM.ROM") && !_pcmFile->open("CM32L_PCM.ROM")) + error("Error opening MT32_PCM.ROM / CM32L_PCM.ROM"); _controlROM = MT32Emu::ROMImage::makeROMImage(_controlFile); _pcmROM = MT32Emu::ROMImage::makeROMImage(_pcmFile); if (!_synth->open(*_controlROM, *_pcmROM)) diff --git a/audio/softsynth/mt32/Part.cpp b/audio/softsynth/mt32/Part.cpp index 0c9e576100..cd385898e1 100644 --- a/audio/softsynth/mt32/Part.cpp +++ b/audio/softsynth/mt32/Part.cpp @@ -68,18 +68,16 @@ Part::Part(Synth *useSynth, unsigned int usePartNum) { activePartialCount = 0; memset(patchCache, 0, sizeof(patchCache)); for (int i = 0; i < MT32EMU_MAX_POLY; i++) { - freePolys.push_front(new Poly(this)); + freePolys.prepend(new Poly(this)); } } Part::~Part() { - while (!activePolys.empty()) { - delete activePolys.front(); - activePolys.pop_front(); + while (!activePolys.isEmpty()) { + delete activePolys.takeFirst(); } - while (!freePolys.empty()) { - delete freePolys.front(); - freePolys.pop_front(); + while (!freePolys.isEmpty()) { + delete freePolys.takeFirst(); } } @@ -246,8 +244,8 @@ void Part::backupCacheToPartials(PatchCache cache[4]) { // if so then duplicate the cached data from the part to the partial so that // we can change the part's cache without affecting the partial. // We delay this until now to avoid a copy operation with every note played - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - (*polyIt)->backupCacheToPartials(cache); + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { + poly->backupCacheToPartials(cache); } } @@ -446,8 +444,7 @@ void Part::abortPoly(Poly *poly) { } bool Part::abortFirstPoly(unsigned int key) { - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { if (poly->getKey() == key) { abortPoly(poly); return true; @@ -457,8 +454,7 @@ bool Part::abortFirstPoly(unsigned int key) { } bool Part::abortFirstPoly(PolyState polyState) { - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { if (poly->getState() == polyState) { abortPoly(poly); return true; @@ -475,10 +471,10 @@ bool Part::abortFirstPolyPreferHeld() { } bool Part::abortFirstPoly() { - if (activePolys.empty()) { + if (activePolys.isEmpty()) { return false; } - abortPoly(activePolys.front()); + abortPoly(activePolys.getFirst()); return true; } @@ -503,17 +499,16 @@ void Part::playPoly(const PatchCache cache[4], const MemParams::RhythmTemp *rhyt return; } - if (freePolys.empty()) { + if (freePolys.isEmpty()) { synth->printDebug("%s (%s): No free poly to play key %d (velocity %d)", name, currentInstr, midiKey, velocity); return; } - Poly *poly = freePolys.front(); - freePolys.pop_front(); + Poly *poly = freePolys.takeFirst(); if (patchTemp->patch.assignMode & 1) { // Priority to data first received - activePolys.push_front(poly); + activePolys.prepend(poly); } else { - activePolys.push_back(poly); + activePolys.append(poly); } Partial *partials[4]; @@ -545,8 +540,7 @@ void Part::playPoly(const PatchCache cache[4], const MemParams::RhythmTemp *rhyt void Part::allNotesOff() { // The MIDI specification states - and Mok confirms - that all notes off (0x7B) // should treat the hold pedal as usual. - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { // FIXME: This has special handling of key 0 in NoteOff that Mok has not yet confirmed applies to AllNotesOff. // if (poly->canSustain() || poly->getKey() == 0) { // FIXME: The real devices are found to be ignoring non-sustaining polys while processing AllNotesOff. Need to be confirmed. @@ -560,15 +554,13 @@ void Part::allSoundOff() { // MIDI "All sound off" (0x78) should release notes immediately regardless of the hold pedal. // This controller is not actually implemented by the synths, though (according to the docs and Mok) - // we're only using this method internally. - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { poly->startDecay(); } } void Part::stopPedalHold() { - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { poly->stopPedalHold(); } } @@ -586,8 +578,7 @@ void Part::stopNote(unsigned int key) { synth->printDebug("%s (%s): stopping key %d", name, currentInstr, key); #endif - for (PolyList::iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { // Generally, non-sustaining instruments ignore note off. They die away eventually anyway. // Key 0 (only used by special cases on rhythm part) reacts to note off even if non-sustaining or pedal held. if (poly->getKey() == key && (poly->canSustain() || key == 0)) { @@ -608,8 +599,7 @@ unsigned int Part::getActivePartialCount() const { unsigned int Part::getActiveNonReleasingPartialCount() const { unsigned int activeNonReleasingPartialCount = 0; - for (PolyList::const_iterator polyIt = activePolys.begin(); polyIt != activePolys.end(); polyIt++) { - Poly *poly = *polyIt; + for (Poly *poly = activePolys.getFirst(); poly != NULL; poly = poly->getNext()) { if (poly->getState() != POLY_Releasing) { activeNonReleasingPartialCount += poly->getActivePartialCount(); } @@ -621,7 +611,7 @@ void Part::partialDeactivated(Poly *poly) { activePartialCount--; if (!poly->isActive()) { activePolys.remove(poly); - freePolys.push_front(poly); + freePolys.prepend(poly); synth->polyStateChanged(partNum); } if (activePartialCount == 0) { @@ -629,4 +619,96 @@ void Part::partialDeactivated(Poly *poly) { } } +//#define POLY_LIST_DEBUG + +PolyList::PolyList() : firstPoly(NULL), lastPoly(NULL) {} + +bool PolyList::isEmpty() const { +#ifdef POLY_LIST_DEBUG + if ((firstPoly == NULL || lastPoly == NULL) && firstPoly != lastPoly) { + printf("PolyList: desynchronised firstPoly & lastPoly pointers\n"); + } +#endif + return firstPoly == NULL && lastPoly == NULL; +} + +Poly *PolyList::getFirst() const { + return firstPoly; +} + +Poly *PolyList::getLast() const { + return lastPoly; +} + +void PolyList::prepend(Poly *poly) { +#ifdef POLY_LIST_DEBUG + if (poly->getNext() != NULL) { + printf("PolyList: Non-NULL next field in a Poly being prepended is ignored\n"); + } +#endif + poly->setNext(firstPoly); + firstPoly = poly; + if (lastPoly == NULL) { + lastPoly = poly; + } +} + +void PolyList::append(Poly *poly) { +#ifdef POLY_LIST_DEBUG + if (poly->getNext() != NULL) { + printf("PolyList: Non-NULL next field in a Poly being appended is ignored\n"); + } +#endif + poly->setNext(NULL); + if (lastPoly != NULL) { +#ifdef POLY_LIST_DEBUG + if (lastPoly->getNext() != NULL) { + printf("PolyList: Non-NULL next field in the lastPoly\n"); + } +#endif + lastPoly->setNext(poly); + } + lastPoly = poly; + if (firstPoly == NULL) { + firstPoly = poly; + } +} + +Poly *PolyList::takeFirst() { + Poly *oldFirst = firstPoly; + firstPoly = oldFirst->getNext(); + if (firstPoly == NULL) { +#ifdef POLY_LIST_DEBUG + if (lastPoly != oldFirst) { + printf("PolyList: firstPoly != lastPoly in a list with a single Poly\n"); + } +#endif + lastPoly = NULL; + } + oldFirst->setNext(NULL); + return oldFirst; +} + +void PolyList::remove(Poly * const polyToRemove) { + if (polyToRemove == firstPoly) { + takeFirst(); + return; + } + for (Poly *poly = firstPoly; poly != NULL; poly = poly->getNext()) { + if (poly->getNext() == polyToRemove) { + if (polyToRemove == lastPoly) { +#ifdef POLY_LIST_DEBUG + if (lastPoly->getNext() != NULL) { + printf("PolyList: Non-NULL next field in the lastPoly\n"); + } +#endif + lastPoly = poly; + } + poly->setNext(polyToRemove->getNext()); + polyToRemove->setNext(NULL); + break; + } + } +} + } diff --git a/audio/softsynth/mt32/Part.h b/audio/softsynth/mt32/Part.h index 7ae73a818c..e5be41ff10 100644 --- a/audio/softsynth/mt32/Part.h +++ b/audio/softsynth/mt32/Part.h @@ -18,13 +18,26 @@ #ifndef MT32EMU_PART_H #define MT32EMU_PART_H -#include <common/list.h> - namespace MT32Emu { class PartialManager; class Synth; -typedef Common::List<Poly *> PolyList; + +class PolyList { +private: + Poly *firstPoly; + Poly *lastPoly; + +public: + PolyList(); + bool isEmpty() const; + Poly *getFirst() const; + Poly *getLast() const; + void prepend(Poly *poly); + void append(Poly *poly); + Poly *takeFirst(); + void remove(Poly * const poly); +}; class Part { private: diff --git a/audio/softsynth/mt32/Poly.cpp b/audio/softsynth/mt32/Poly.cpp index c45391f672..46e30c0f02 100644 --- a/audio/softsynth/mt32/Poly.cpp +++ b/audio/softsynth/mt32/Poly.cpp @@ -29,6 +29,7 @@ Poly::Poly(Part *usePart) { partials[i] = NULL; } state = POLY_Inactive; + next = NULL; } void Poly::reset(unsigned int newKey, unsigned int newVelocity, bool newSustain, Partial **newPartials) { @@ -174,4 +175,12 @@ void Poly::partialDeactivated(Partial *partial) { part->partialDeactivated(this); } +Poly *Poly::getNext() { + return next; +} + +void Poly::setNext(Poly *poly) { + next = poly; +} + } diff --git a/audio/softsynth/mt32/Poly.h b/audio/softsynth/mt32/Poly.h index cd15a776f5..e25b6d8993 100644 --- a/audio/softsynth/mt32/Poly.h +++ b/audio/softsynth/mt32/Poly.h @@ -41,6 +41,8 @@ private: Partial *partials[4]; + Poly *next; + public: Poly(Part *part); void reset(unsigned int key, unsigned int velocity, bool sustain, Partial **partials); @@ -60,6 +62,9 @@ public: bool isActive() const; void partialDeactivated(Partial *partial); + + Poly *getNext(); + void setNext(Poly *poly); }; } diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index a6a6b97870..862f4c39d2 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -226,6 +226,6 @@ void std_clearerr(FILE *handle); int std_fflush(FILE *handle); int std_ferror(FILE *handle); -} // End of namespace DS +} // End of namespace DS #endif //_DS_FS_H diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index 94262d0d92..e42b8ca313 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -102,6 +102,7 @@ public: void sysEx(const byte *msg, uint16 length); private: + void loadSoundFont(const char *soundfont); AUGraph _auGraph; AudioUnit _synth; }; @@ -171,52 +172,8 @@ int MidiDriver_CORE::open() { #endif // Load custom soundfont, if specified - if (ConfMan.hasKey("soundfont")) { - const char *soundfont = ConfMan.get("soundfont").c_str(); - - // TODO: We should really check whether the file contains an - // actual soundfont... - -#if USE_DEPRECATED_COREAUDIO_API - // Before 10.5, we need to use kMusicDeviceProperty_SoundBankFSSpec - FSRef fsref; - FSSpec fsSpec; - err = FSPathMakeRef ((const byte *)soundfont, &fsref, NULL); - - if (err == noErr) { - err = FSGetCatalogInfo (&fsref, kFSCatInfoNone, NULL, NULL, &fsSpec, NULL); - } - - if (err == noErr) { - err = AudioUnitSetProperty ( - _synth, - kMusicDeviceProperty_SoundBankFSSpec, kAudioUnitScope_Global, - 0, - &fsSpec, sizeof(fsSpec) - ); - } -#else - // kMusicDeviceProperty_SoundBankFSSpec is present on 10.6+, but broken - // kMusicDeviceProperty_SoundBankURL was added in 10.5 as a replacement - CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)soundfont, strlen(soundfont), false); - - if (url) { - err = AudioUnitSetProperty ( - _synth, - kMusicDeviceProperty_SoundBankURL, kAudioUnitScope_Global, - 0, - &url, sizeof(url) - ); - - CFRelease(url); - } else { - warning("Failed to allocate CFURLRef from '%s'", soundfont); - } -#endif - - if (err != noErr) - error("Failed loading custom sound font '%s' (error %ld)", soundfont, (long)err); - } + if (ConfMan.hasKey("soundfont")) + loadSoundFont(ConfMan.get("soundfont").c_str()); #ifdef COREAUDIO_DISABLE_REVERB // Disable reverb mode, as that sucks up a lot of CPU power, which can @@ -242,6 +199,74 @@ bail: return MERR_CANNOT_CONNECT; } +void MidiDriver_CORE::loadSoundFont(const char *soundfont) { + // TODO: We should really check whether the file contains an + // actual soundfont... + + OSStatus err = 0; + +#if USE_DEPRECATED_COREAUDIO_API + FSRef fsref; + err = FSPathMakeRef((const byte *)soundfont, &fsref, NULL); + + SInt32 version; + err = Gestalt(gestaltSystemVersion, &version); + + if (err == noErr) { + if (version >= 0x1030) { + // Use kMusicDeviceProperty_SoundBankFSRef in >= 10.3 + + // HACK HACK HACK HACK SUPER HACK: Using the value of 1012 instead of + // kMusicDeviceProperty_SoundBankFSRef so this compiles with the 10.2 + // SDK (which does not have that symbol). + if (err == noErr) { + err = AudioUnitSetProperty( + _synth, + /*kMusicDeviceProperty_SoundBankFSRef*/ 1012, kAudioUnitScope_Global, + 0, + &fsref, sizeof(fsref) + ); + } + } else { + // In 10.2, only kMusicDeviceProperty_SoundBankFSSpec is available + FSSpec fsSpec; + + if (err == noErr) + err = FSGetCatalogInfo(&fsref, kFSCatInfoNone, NULL, NULL, &fsSpec, NULL); + + if (err == noErr) { + err = AudioUnitSetProperty( + _synth, + kMusicDeviceProperty_SoundBankFSSpec, kAudioUnitScope_Global, + 0, + &fsSpec, sizeof(fsSpec) + ); + } + } + } +#else + // kMusicDeviceProperty_SoundBankURL was added in 10.5 as a replacement + // In addition, the File Manager API became deprecated starting in 10.8 + CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)soundfont, strlen(soundfont), false); + + if (url) { + err = AudioUnitSetProperty( + _synth, + kMusicDeviceProperty_SoundBankURL, kAudioUnitScope_Global, + 0, + &url, sizeof(url) + ); + + CFRelease(url); + } else { + warning("Failed to allocate CFURLRef from '%s'", soundfont); + } +#endif // USE_DEPRECATED_COREAUDIO_API + + if (err != noErr) + error("Failed loading custom sound font '%s' (error %ld)", soundfont, (long)err); +} + void MidiDriver_CORE::close() { MidiDriver_MPU401::close(); if (_auGraph) { diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp index 1e8d56615d..ef2dc9c3b8 100644 --- a/backends/platform/ds/arm9/source/blitters.cpp +++ b/backends/platform/ds/arm9/source/blitters.cpp @@ -391,4 +391,4 @@ void Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStr } } -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h index 7700b4d68d..de6e218778 100644 --- a/backends/platform/ds/arm9/source/blitters.h +++ b/backends/platform/ds/arm9/source/blitters.h @@ -35,7 +35,7 @@ void asmCopy8Col(byte *dst, int dstPitch, const byte *src, int height); void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette); void Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStride, int srcStride); -} // End of namespace DS +} // End of namespace DS #else diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index 6612e0f2da..277e1f4ae7 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -536,4 +536,4 @@ bool isPlaying() { } } -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/cdaudio.h b/backends/platform/ds/arm9/source/cdaudio.h index fc16f2f220..8a0e0c5174 100644 --- a/backends/platform/ds/arm9/source/cdaudio.h +++ b/backends/platform/ds/arm9/source/cdaudio.h @@ -38,6 +38,6 @@ bool isPlaying(); void update(); } -} // End of namespace DS +} // End of namespace DS #endif diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index cedbdcb167..830c782b90 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -3225,7 +3225,7 @@ int main(void) { return 0; } -} // End of namespace DS +} // End of namespace DS int main() { diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h index 9c0d326292..ad49ae276d 100644 --- a/backends/platform/ds/arm9/source/dsmain.h +++ b/backends/platform/ds/arm9/source/dsmain.h @@ -153,7 +153,7 @@ void* fastRamAlloc(int size); void exitGame(); -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp index 7154d4ae3f..ac552bd826 100644 --- a/backends/platform/ds/arm9/source/dsoptions.cpp +++ b/backends/platform/ds/arm9/source/dsoptions.cpp @@ -432,4 +432,4 @@ void setOptions() { firstLoad = false; } -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h index 9148060f4b..9949b8b7d2 100644 --- a/backends/platform/ds/arm9/source/dsoptions.h +++ b/backends/platform/ds/arm9/source/dsoptions.h @@ -78,6 +78,6 @@ protected: extern void showOptionsDialog(); extern void setOptions(); -} // End of namespace DS +} // End of namespace DS #endif diff --git a/backends/platform/ds/arm9/source/keys.cpp b/backends/platform/ds/arm9/source/keys.cpp index aec7d57bda..fdb981dfe5 100644 --- a/backends/platform/ds/arm9/source/keys.cpp +++ b/backends/platform/ds/arm9/source/keys.cpp @@ -133,4 +133,4 @@ uint32 keysUp(void) { } -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/keys.h b/backends/platform/ds/arm9/source/keys.h index 71c770dcd5..9d6b41c746 100644 --- a/backends/platform/ds/arm9/source/keys.h +++ b/backends/platform/ds/arm9/source/keys.h @@ -30,4 +30,4 @@ uint32 keysDownRepeat(void); void keysSetRepeat(u8 setDelay, u8 setRepeat); uint32 keysUp(void); -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp index 112ba49d76..a3fdaacfaa 100644 --- a/backends/platform/ds/arm9/source/scummhelp.cpp +++ b/backends/platform/ds/arm9/source/scummhelp.cpp @@ -91,7 +91,7 @@ void updateStrings(byte gameId, byte version, Common::Platform platform, } -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/scummhelp.h b/backends/platform/ds/arm9/source/scummhelp.h index 2735727560..41fc8f9c91 100644 --- a/backends/platform/ds/arm9/source/scummhelp.h +++ b/backends/platform/ds/arm9/source/scummhelp.h @@ -31,7 +31,7 @@ namespace DS { void updateStrings(byte gameId, byte version, Common::Platform platform, int page, Common::String &title, Common::String *&key, Common::String *&dsc); -} // End of namespace DS +} // End of namespace DS #endif diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp index 581509f939..77da9cc22a 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.cpp +++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp @@ -585,4 +585,4 @@ void addKeyboardEvents() { } -} // End of namespace DS +} // End of namespace DS diff --git a/backends/platform/ds/arm9/source/touchkeyboard.h b/backends/platform/ds/arm9/source/touchkeyboard.h index ae056e84da..dc20601023 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.h +++ b/backends/platform/ds/arm9/source/touchkeyboard.h @@ -46,6 +46,6 @@ void clearAutoComplete(); void setCharactersEntered(int count); void releaseAllKeys(); -} // End of namespace DS +} // End of namespace DS #endif diff --git a/backends/platform/ds/arm9/source/wordcompletion.cpp b/backends/platform/ds/arm9/source/wordcompletion.cpp index 5f3b80c474..51f93df7ff 100644 --- a/backends/platform/ds/arm9/source/wordcompletion.cpp +++ b/backends/platform/ds/arm9/source/wordcompletion.cpp @@ -198,6 +198,6 @@ bool findWordCompletions(const char *input) { } -} // End of namespace DS +} // End of namespace DS #endif diff --git a/backends/platform/ds/arm9/source/wordcompletion.h b/backends/platform/ds/arm9/source/wordcompletion.h index 3d352f657a..c355d29293 100644 --- a/backends/platform/ds/arm9/source/wordcompletion.h +++ b/backends/platform/ds/arm9/source/wordcompletion.h @@ -27,4 +27,4 @@ extern bool findWordCompletions(const char *input); extern void addAutoCompleteLine(const char *line); extern void sortAutoCompleteWordList(); -} // End of namespace DS +} // End of namespace DS diff --git a/base/commandLine.cpp b/base/commandLine.cpp index c5c9fe3c90..f6d1f1f702 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -240,6 +240,8 @@ void registerDefaults() { ConfMan.registerDefault("gui_saveload_chooser", "grid"); ConfMan.registerDefault("gui_saveload_last_pos", "0"); + ConfMan.registerDefault("gui_browser_show_hidden", false); + #ifdef USE_FLUIDSYNTH // The settings are deliberately stored the same way as in Qsynth. The // FluidSynth music driver is responsible for transforming them into diff --git a/common/bufferedstream.h b/common/bufferedstream.h index 55ea8dc13b..6c859c98fe 100644 --- a/common/bufferedstream.h +++ b/common/bufferedstream.h @@ -61,6 +61,6 @@ SeekableReadStream *wrapBufferedSeekableReadStream(SeekableReadStream *parentStr */ WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/config-file.cpp b/common/config-file.cpp index 4224d7491d..fe042e9eda 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -380,4 +380,4 @@ void ConfigFile::Section::removeKey(const String &key) { } } -} // End of namespace Common +} // End of namespace Common diff --git a/common/config-file.h b/common/config-file.h index 7bc5604b4c..8bd731c038 100644 --- a/common/config-file.h +++ b/common/config-file.h @@ -134,6 +134,6 @@ private: */ -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/config-manager.h b/common/config-manager.h index 02d4ec3438..d43a7bec51 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -175,7 +175,7 @@ private: String _filename; }; -} // End of namespace Common +} // End of namespace Common /** Shortcut for accessing the configuration manager. */ #define ConfMan Common::ConfigManager::instance() diff --git a/common/debug-channels.h b/common/debug-channels.h index 54de9d491e..40d1ea667e 100644 --- a/common/debug-channels.h +++ b/common/debug-channels.h @@ -124,6 +124,6 @@ private: /** Shortcut for accessing the debug manager. */ #define DebugMan Common::DebugManager::instance() -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/debug.cpp b/common/debug.cpp index 9c3a93e5a6..ba5479c34d 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -102,7 +102,7 @@ bool DebugManager::isDebugChannelEnabled(uint32 channel) { return (gDebugChannelsEnabled & channel) != 0; } -} // End of namespace Common +} // End of namespace Common #ifndef DISABLE_TEXT_CONSOLE diff --git a/common/file.cpp b/common/file.cpp index 12d73c9973..7ad6bc2e81 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -202,4 +202,4 @@ bool DumpFile::flush() { return _handle->flush(); } -} // End of namespace Common +} // End of namespace Common diff --git a/common/fs.cpp b/common/fs.cpp index 0143c936d4..19a01074ea 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -335,4 +335,4 @@ int FSDirectory::listMembers(ArchiveMemberList &list) const { } -} // End of namespace Common +} // End of namespace Common diff --git a/common/func.h b/common/func.h index db57d73668..a4a80e5406 100644 --- a/common/func.h +++ b/common/func.h @@ -535,6 +535,6 @@ GENERATE_TRIVIAL_HASH_FUNCTOR(unsigned long); #undef GENERATE_TRIVIAL_HASH_FUNCTOR -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/hash-str.h b/common/hash-str.h index 08f0558bfd..190e6922eb 100644 --- a/common/hash-str.h +++ b/common/hash-str.h @@ -79,7 +79,7 @@ typedef HashMap<String, String, IgnoreCase_Hash, IgnoreCase_EqualTo> StringMap; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/hashmap.cpp b/common/hashmap.cpp index ff8f9db9ce..e505d1dd25 100644 --- a/common/hashmap.cpp +++ b/common/hashmap.cpp @@ -106,4 +106,4 @@ void updateHashCollisionStats(int collisions, int dummyHits, int lookups, int ar } #endif -} // End of namespace Common +} // End of namespace Common diff --git a/common/hashmap.h b/common/hashmap.h index 7cf54997e8..42509d67e5 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -632,6 +632,6 @@ void HashMap<Key, Val, HashFunc, EqualFunc>::erase(const Key &key) { #undef HASHMAP_DUMMY_NODE -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/iff_container.cpp b/common/iff_container.cpp index ffaa5c6d06..9c6e5f124a 100644 --- a/common/iff_container.cpp +++ b/common/iff_container.cpp @@ -122,4 +122,4 @@ uint32 PackBitsReadStream::read(void *dataPtr, uint32 dataSize) { return dataSize - left; } -} // End of namespace Common +} // End of namespace Common diff --git a/common/language.h b/common/language.h index db552fc9c4..03b9ebaf8e 100644 --- a/common/language.h +++ b/common/language.h @@ -81,6 +81,6 @@ const String getGameGUIOptionsDescriptionLanguage(Common::Language lang); // TODO: Document this GUIO related function bool checkGameGUIOptionLanguage(Common::Language lang, const String &str); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/memorypool.h b/common/memorypool.h index 9a4e523d53..1cd725b99d 100644 --- a/common/memorypool.h +++ b/common/memorypool.h @@ -141,7 +141,7 @@ public: } }; -} // End of namespace Common +} // End of namespace Common /** * A custom placement new operator, using an arbitrary MemoryPool. diff --git a/common/memstream.h b/common/memstream.h index 497a178ab9..260fb64d84 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -173,6 +173,6 @@ public: bool seek(int32 offset, int whence = SEEK_SET); }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/mutex.cpp b/common/mutex.cpp index 4e6316528c..f912e79591 100644 --- a/common/mutex.cpp +++ b/common/mutex.cpp @@ -75,4 +75,4 @@ void StackLock::unlock() { g_system->unlockMutex(_mutex); } -} // End of namespace Common +} // End of namespace Common diff --git a/common/platform.h b/common/platform.h index 1891c7096d..5a4f3f1802 100644 --- a/common/platform.h +++ b/common/platform.h @@ -75,6 +75,6 @@ extern const char *getPlatformCode(Platform id); extern const char *getPlatformAbbrev(Platform id); extern const char *getPlatformDescription(Platform id); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/random.cpp b/common/random.cpp index 55fa3cbd30..fd75534c44 100644 --- a/common/random.cpp +++ b/common/random.cpp @@ -59,4 +59,4 @@ uint RandomSource::getRandomNumberRng(uint min, uint max) { return getRandomNumber(max - min) + min; } -} // End of namespace Common +} // End of namespace Common diff --git a/common/random.h b/common/random.h index 90f2ed5cb0..c8aec58946 100644 --- a/common/random.h +++ b/common/random.h @@ -74,6 +74,6 @@ public: uint getRandomNumberRng(uint min, uint max); }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/rect.h b/common/rect.h index 8d1243f7e4..5790cf7c0f 100644 --- a/common/rect.h +++ b/common/rect.h @@ -266,6 +266,6 @@ struct Rect { } }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/singleton.h b/common/singleton.h index d7078360f3..6e47f119ba 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -97,6 +97,6 @@ protected: #define DECLARE_SINGLETON(T) \ template<> T *Singleton<T>::_singleton = 0 -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/str.cpp b/common/str.cpp index 8210ca6bb8..61fdcfaf31 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -850,7 +850,7 @@ size_t strlcat(char *dst, const char *src, size_t size) { return dstLength + (src - srcStart); } -} // End of namespace Common +} // End of namespace Common // Portable implementation of stricmp / strcasecmp / strcmpi. // TODO: Rename this to Common::strcasecmp diff --git a/common/stream.cpp b/common/stream.cpp index 85647bfe3a..f49603c882 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -342,7 +342,7 @@ uint32 BufferedReadStream::read(void *dataPtr, uint32 dataSize) { return alreadyRead + dataSize; } -} // End of nameless namespace +} // End of anonymous namespace ReadStream *wrapBufferedReadStream(ReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) { @@ -379,12 +379,25 @@ BufferedSeekableReadStream::BufferedSeekableReadStream(SeekableReadStream *paren bool BufferedSeekableReadStream::seek(int32 offset, int whence) { // If it is a "local" seek, we may get away with "seeking" around // in the buffer only. - // Note: We could try to handle SEEK_END and SEEK_SET, too, but - // since they are rarely used, it seems not worth the effort. _eos = false; // seeking always cancels EOS - if (whence == SEEK_CUR && (int)_pos + offset >= 0 && _pos + offset <= _bufSize) { - _pos += offset; + int relOffset = 0; + switch (whence) { + case SEEK_SET: + relOffset = offset - pos(); + break; + case SEEK_CUR: + relOffset = offset; + break; + case SEEK_END: + relOffset = (size() + offset) - pos(); + break; + default: + break; + } + + if ((int)_pos + relOffset >= 0 && _pos + relOffset <= _bufSize) { + _pos += relOffset; // Note: we do not need to reset parent's eos flag here. It is // sufficient that it is reset when actually seeking in the parent. @@ -393,14 +406,21 @@ bool BufferedSeekableReadStream::seek(int32 offset, int whence) { // just seek normally in the parent stream. if (whence == SEEK_CUR) offset -= (_bufSize - _pos); - _pos = _bufSize; + // We invalidate the buffer here. This assures that successive seeks + // do not have the chance to incorrectly think they seeked back into + // the buffer. + // Note: This does not take full advantage of the buffer. But it is + // a simple way to prevent nasty errors. It would be possible to take + // full advantage of the buffer by saving its actual start position. + // This seems not worth the effort for this seemingly uncommon use. + _pos = _bufSize = 0; _parentStream->seek(offset, whence); } return true; } -} // End of nameless namespace +} // End of anonymous namespace SeekableReadStream *wrapBufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) { if (parentStream) @@ -482,7 +502,7 @@ public: }; -} // End of nameless namespace +} // End of anonymous namespace WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize) { if (parentStream) @@ -490,4 +510,4 @@ WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize) return 0; } -} // End of namespace Common +} // End of namespace Common diff --git a/common/stream.h b/common/stream.h index 26c04e5bf6..33ebc95a86 100644 --- a/common/stream.h +++ b/common/stream.h @@ -454,6 +454,6 @@ public: }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/taskbar.h b/common/taskbar.h index 6f28028e74..b4ec673739 100644 --- a/common/taskbar.h +++ b/common/taskbar.h @@ -136,7 +136,7 @@ public: virtual void clearError() {} }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/textconsole.cpp b/common/textconsole.cpp index ffa42e63a0..a721c121d5 100644 --- a/common/textconsole.cpp +++ b/common/textconsole.cpp @@ -40,7 +40,7 @@ void setErrorHandler(ErrorHandler handler) { } -} // End of namespace Common +} // End of namespace Common #ifndef DISABLE_TEXT_CONSOLE diff --git a/common/textconsole.h b/common/textconsole.h index 364c49b2e9..12f15e5e4b 100644 --- a/common/textconsole.h +++ b/common/textconsole.h @@ -56,7 +56,7 @@ typedef void (*ErrorHandler)(const char *msg); */ void setErrorHandler(ErrorHandler handler); -} // End of namespace Common +} // End of namespace Common void NORETURN_PRE error(const char *s, ...) GCC_PRINTF(1, 2) NORETURN_POST; diff --git a/common/unzip.cpp b/common/unzip.cpp index ab659343a2..69b9ff67cb 100644 --- a/common/unzip.cpp +++ b/common/unzip.cpp @@ -1534,4 +1534,4 @@ Archive *makeZipArchive(SeekableReadStream *stream) { return new ZipArchive(zipFile); } -} // End of namespace Common +} // End of namespace Common diff --git a/common/unzip.h b/common/unzip.h index 06480b0054..2e0dae831a 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -56,6 +56,6 @@ Archive *makeZipArchive(const FSNode &node); */ Archive *makeZipArchive(SeekableReadStream *stream); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/updates.h b/common/updates.h index 4d58a216fb..0012808a17 100644 --- a/common/updates.h +++ b/common/updates.h @@ -95,7 +95,7 @@ public: virtual UpdateInterval getUpdateCheckInterval() { return kUpdateIntervalNotSupported; } }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/zlib.cpp b/common/zlib.cpp index fc8f351054..920338e57e 100644 --- a/common/zlib.cpp +++ b/common/zlib.cpp @@ -392,17 +392,21 @@ public: #endif // USE_ZLIB SeekableReadStream *wrapCompressedReadStream(SeekableReadStream *toBeWrapped, uint32 knownSize) { -#if defined(USE_ZLIB) if (toBeWrapped) { uint16 header = toBeWrapped->readUint16BE(); bool isCompressed = (header == 0x1F8B || ((header & 0x0F00) == 0x0800 && header % 31 == 0)); toBeWrapped->seek(-2, SEEK_CUR); - if (isCompressed) + if (isCompressed) { +#if defined(USE_ZLIB) return new GZipReadStream(toBeWrapped, knownSize); - } +#else + delete toBeWrapped; + return NULL; #endif + } + } return toBeWrapped; } @@ -415,4 +419,4 @@ WriteStream *wrapCompressedWriteStream(WriteStream *toBeWrapped) { } -} // End of namespace Common +} // End of namespace Common diff --git a/common/zlib.h b/common/zlib.h index 6a840f5fdc..d940f3f3a1 100644 --- a/common/zlib.h +++ b/common/zlib.h @@ -103,7 +103,9 @@ bool inflateZlibInstallShield(byte *dst, uint dstLen, const byte *src, uint srcL * provides transparent on-the-fly decompression. Assumes the data it * retrieves from the wrapped stream to be either uncompressed or in gzip * format. In the former case, the original stream is returned unmodified - * (and in particular, not wrapped). + * (and in particular, not wrapped). In the latter case the stream is + * returned wrapped, unless there is no ZLIB support, then NULL is returned + * and the old stream is destroyed. * * Certain GZip-formats don't supply an easily readable length, if you * still need the length carried along with the stream, and you know @@ -129,6 +131,6 @@ SeekableReadStream *wrapCompressedReadStream(SeekableReadStream *toBeWrapped, ui */ WriteStream *wrapCompressedWriteStream(WriteStream *toBeWrapped); -} // End of namespace Common +} // End of namespace Common #endif @@ -21,6 +21,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + # Save the current environment variables for next runs SAVED_CONFIGFLAGS=$@ SAVED_LDFLAGS=$LDFLAGS diff --git a/devtools/credits.pl b/devtools/credits.pl index ff3b37a5da..28c3139bfd 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -267,14 +267,22 @@ sub begin_section { print '\f1\b0\fs24 \cf0 \\' . "\n"; } elsif ($mode eq "CPP") { if ($section_level eq 0) { - # TODO: Would be nice to have a 'fat' or 'large' mode for - # headlines... - $title = html_entities_to_cpp($title); - print '"C1""'.$title.'",' . "\n"; - print '"",' . "\n"; + # TODO: Would be nice to have a 'fat' or 'large' mode for + # headlines... + my $ascii_title = html_entities_to_ascii($title); + $title = html_entities_to_cpp($title); + if ($ascii_title ne $title) { + print '"A1""'.$ascii_title.'",' . "\n"; + } + print '"C1""'.$title.'",' . "\n"; + print '"",' . "\n"; } else { - $title = html_entities_to_cpp($title); - print '"C1""'.$title.'",' . "\n"; + my $ascii_title = html_entities_to_ascii($title); + $title = html_entities_to_cpp($title); + if ($ascii_title ne $title) { + print '"A1""'.$ascii_title.'",' . "\n"; + } + print '"C1""'.$title.'",' . "\n"; } } elsif ($mode eq "XML-DOC") { print " <row><entry namest='start' nameend='job'>"; @@ -392,13 +400,21 @@ sub add_person { } } elsif ($mode eq "CPP") { $name = $nick if $name eq ""; + my $ascii_name = html_entities_to_ascii($name); $name = html_entities_to_cpp($name); + if ($ascii_name ne $name) { + print '"A0""'.$ascii_name.'",' . "\n"; + } print '"C0""'.$name.'",' . "\n"; # Print desc wrapped if (length $desc > 0) { + my $ascii_desc = html_entities_to_ascii($desc); $desc = html_entities_to_cpp($desc); + if ($ascii_desc ne $desc) { + print '"A2""'.$ascii_desc.'",' . "\n"; + } print '"C2""'.$desc.'",' . "\n"; } } elsif ($mode eq "XML-DOC") { diff --git a/dists/engine-data/wintermute.zip b/dists/engine-data/wintermute.zip Binary files differnew file mode 100644 index 0000000000..924429972b --- /dev/null +++ b/dists/engine-data/wintermute.zip diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 45924f724d..b9c001c1f1 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -20,34 +20,37 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" translations.dat FILE "gui/themes/translations.dat" #endif -#if ENABLE_DRASCULA == STATIC_PLUGIN +#if ENABLE_DRASCULA == STATIC_PLUGIN drascula.dat FILE "dists/engine-data/drascula.dat" #endif -#if ENABLE_HUGO == STATIC_PLUGIN +#if ENABLE_HUGO == STATIC_PLUGIN hugo.dat FILE "dists/engine-data/hugo.dat" #endif -#if ENABLE_KYRA == STATIC_PLUGIN +#if ENABLE_KYRA == STATIC_PLUGIN kyra.dat FILE "dists/engine-data/kyra.dat" #endif -#if ENABLE_LURE == STATIC_PLUGIN +#if ENABLE_LURE == STATIC_PLUGIN lure.dat FILE "dists/engine-data/lure.dat" #endif -#if ENABLE_QUEEN == STATIC_PLUGIN +#if ENABLE_QUEEN == STATIC_PLUGIN queen.tbl FILE "dists/engine-data/queen.tbl" #endif -#if ENABLE_SKY == STATIC_PLUGIN +#if ENABLE_SKY == STATIC_PLUGIN sky.cpt FILE "dists/engine-data/sky.cpt" #endif -#if ENABLE_TEENAGENT == STATIC_PLUGIN +#if ENABLE_TEENAGENT == STATIC_PLUGIN teenagent.dat FILE "dists/engine-data/teenagent.dat" #endif -#if ENABLE_TOON == STATIC_PLUGIN +#if ENABLE_TOON == STATIC_PLUGIN toon.dat FILE "dists/engine-data/toon.dat" #endif -#if ENABLE_TONY == STATIC_PLUGIN +#if ENABLE_TONY == STATIC_PLUGIN tony.dat FILE "dists/engine-data/tony.dat" #endif -#if ENABLE_AGI == STATIC_PLUGIN +#if ENABLE_WINTERMUTE == STATIC_PLUGIN +wintermute.zip FILE "dists/engine-data/wintermute.zip" +#endif +#if ENABLE_AGI == STATIC_PLUGIN pred.dic FILE "dists/pred.dic" #endif diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 3be699f84b..f986cc52e8 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -20,31 +20,34 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" translations.dat FILE "gui/themes/translations.dat" #endif -#if ENABLE_DRASCULA == STATIC_PLUGIN +#if ENABLE_DRASCULA == STATIC_PLUGIN drascula.dat FILE "dists/engine-data/drascula.dat" #endif -#if ENABLE_HUGO == STATIC_PLUGIN +#if ENABLE_HUGO == STATIC_PLUGIN hugo.dat FILE "dists/engine-data/hugo.dat" #endif -#if ENABLE_KYRA == STATIC_PLUGIN +#if ENABLE_KYRA == STATIC_PLUGIN kyra.dat FILE "dists/engine-data/kyra.dat" #endif -#if ENABLE_LURE == STATIC_PLUGIN +#if ENABLE_LURE == STATIC_PLUGIN lure.dat FILE "dists/engine-data/lure.dat" #endif -#if ENABLE_QUEEN == STATIC_PLUGIN +#if ENABLE_QUEEN == STATIC_PLUGIN queen.tbl FILE "dists/engine-data/queen.tbl" #endif -#if ENABLE_SKY == STATIC_PLUGIN +#if ENABLE_SKY == STATIC_PLUGIN sky.cpt FILE "dists/engine-data/sky.cpt" #endif -#if ENABLE_TEENAGENT == STATIC_PLUGIN +#if ENABLE_TEENAGENT == STATIC_PLUGIN teenagent.dat FILE "dists/engine-data/teenagent.dat" #endif -#if ENABLE_TOON == STATIC_PLUGIN +#if ENABLE_TOON == STATIC_PLUGIN toon.dat FILE "dists/engine-data/toon.dat" #endif -#if ENABLE_AGI == STATIC_PLUGIN +#if ENABLE_WINTERMUTE == STATIC_PLUGIN +wintermute.zip FILE "dists/engine-data/wintermute.zip" +#endif +#if ENABLE_AGI == STATIC_PLUGIN pred.dic FILE "dists/pred.dic" #endif diff --git a/engines/agi/logic.h b/engines/agi/logic.h index fecc2e3b8a..14137f01d2 100644 --- a/engines/agi/logic.h +++ b/engines/agi/logic.h @@ -37,6 +37,6 @@ struct AgiLogic { const char **texts; /**< message list */ }; -} // End of namespace Agi +} // End of namespace Agi #endif /* AGI_LOGIC_H */ diff --git a/engines/agi/lzw.h b/engines/agi/lzw.h index e3fbafe584..c732491e8e 100644 --- a/engines/agi/lzw.h +++ b/engines/agi/lzw.h @@ -27,6 +27,6 @@ namespace Agi { void lzwExpand(uint8 *, uint8 *, int32); -} // End of namespace Agi +} // End of namespace Agi #endif /* AGI_LZW_H */ diff --git a/engines/agi/preagi_winnie.h b/engines/agi/preagi_winnie.h index 96ae65997e..f34c80cec1 100644 --- a/engines/agi/preagi_winnie.h +++ b/engines/agi/preagi_winnie.h @@ -355,6 +355,6 @@ private: void printStrWinnie(char *szMsg); }; -} // End of namespace Agi +} // End of namespace Agi #endif diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp index 83e49971fb..fa29cc886b 100644 --- a/engines/composer/resource.cpp +++ b/engines/composer/resource.cpp @@ -400,4 +400,4 @@ void OldPipe::nextFrame() { _currFrame++; } -} // End of namespace Composer +} // End of namespace Composer diff --git a/engines/cruise/linker.h b/engines/cruise/linker.h index ce212f6cea..25f4a5cc2a 100644 --- a/engines/cruise/linker.h +++ b/engines/cruise/linker.h @@ -27,5 +27,5 @@ namespace Cruise { void updateAllScriptsImports(); -} // End of namespace Cruise +} // End of namespace Cruise #endif diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp index 636b7ae476..5af95f27e3 100644 --- a/engines/mohawk/installer_archive.cpp +++ b/engines/mohawk/installer_archive.cpp @@ -133,4 +133,4 @@ Common::SeekableReadStream *InstallerArchive::createReadStreamForMember(const Co return Common::decompressDCL(_stream, entry.compressedSize, entry.uncompressedSize); } -} // End of namespace Mohawk +} // End of namespace Mohawk diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp index f01375bacf..d7e829118a 100644 --- a/engines/mohawk/resource.cpp +++ b/engines/mohawk/resource.cpp @@ -464,4 +464,4 @@ bool DOSArchive_v2::openStream(Common::SeekableReadStream *stream) { return true; } -} // End of namespace Mohawk +} // End of namespace Mohawk diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp index 908005b665..ba631148d5 100644 --- a/engines/pegasus/detection.cpp +++ b/engines/pegasus/detection.cpp @@ -119,12 +119,12 @@ SaveStateList PegasusMetaEngine::listSaves(const char *target) const { // The original had no pattern, so the user must rename theirs // Note that we ignore the target because saves are compatible between // all versions - Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles("pegasus-*.sav"); + Common::StringArray fileNames = Pegasus::PegasusEngine::listSaveFiles(); SaveStateList saveList; - for (uint32 i = 0; i < filenames.size(); i++) { + for (uint32 i = 0; i < fileNames.size(); i++) { // Isolate the description from the file name - Common::String desc = filenames[i].c_str() + 8; + Common::String desc = fileNames[i].c_str() + 8; for (int j = 0; j < 4; j++) desc.deleteLastChar(); @@ -136,8 +136,8 @@ SaveStateList PegasusMetaEngine::listSaves(const char *target) const { void PegasusMetaEngine::removeSaveState(const char *target, int slot) const { // See listSaves() for info on the pattern - Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles("pegasus-*.sav"); - g_system->getSavefileManager()->removeSavefile(filenames[slot].c_str()); + Common::StringArray fileNames = Pegasus::PegasusEngine::listSaveFiles(); + g_system->getSavefileManager()->removeSavefile(fileNames[slot].c_str()); } bool PegasusMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { diff --git a/engines/pegasus/elements.cpp b/engines/pegasus/elements.cpp index c84d555444..87fb69a557 100644 --- a/engines/pegasus/elements.cpp +++ b/engines/pegasus/elements.cpp @@ -259,8 +259,8 @@ void FrameSequence::openFrameSequence() { _frameTimes.clear(); for (uint32 i = 0; i < _numFrames; i++) { TimeValue time = res->readUint32BE(); - _duration += time; _frameTimes.push_back(_duration); + _duration += time; } setScale(scale); diff --git a/engines/pegasus/energymonitor.cpp b/engines/pegasus/energymonitor.cpp index 8aa77eb341..be9d205360 100644 --- a/engines/pegasus/energymonitor.cpp +++ b/engines/pegasus/energymonitor.cpp @@ -262,9 +262,9 @@ void EnergyMonitor::calibrateEnergyBar() { _energyLight.setCurrentFrameIndex(0); _energyLight.hide(); - show(); setEnergyValue(0); setEnergyDrainRate(-(int32)kMaxJMPEnergy / 2); + show(); // Make sure warning light is hidden... _energyLight.hide(); diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp index 98f0553783..eedfaa7db3 100644 --- a/engines/pegasus/pegasus.cpp +++ b/engines/pegasus/pegasus.cpp @@ -639,9 +639,15 @@ void PegasusEngine::writeContinueStream(Common::WriteStream *stream) { delete[] data; } +Common::StringArray PegasusEngine::listSaveFiles() { + Common::StringArray fileNames = g_system->getSavefileManager()->listSavefiles("pegasus-*.sav"); + Common::sort(fileNames.begin(), fileNames.end()); + return fileNames; +} + Common::Error PegasusEngine::loadGameState(int slot) { - Common::StringArray filenames = _saveFileMan->listSavefiles("pegasus-*.sav"); - Common::InSaveFile *loadFile = _saveFileMan->openForLoading(filenames[slot]); + Common::StringArray fileNames = listSaveFiles(); + Common::InSaveFile *loadFile = _saveFileMan->openForLoading(fileNames[slot]); if (!loadFile) return Common::kUnknownError; @@ -651,7 +657,23 @@ Common::Error PegasusEngine::loadGameState(int slot) { return valid ? Common::kNoError : Common::kUnknownError; } +static bool isValidSaveFileChar(char c) { + // Limit it to letters, digits, and a few other characters that should be safe + return Common::isAlnum(c) || c == ' ' || c == '_' || c == '+' || c == '-' || c == '.'; +} + +static bool isValidSaveFileName(const Common::String &desc) { + for (uint32 i = 0; i < desc.size(); i++) + if (!isValidSaveFileChar(desc[i])) + return false; + + return true; +} + Common::Error PegasusEngine::saveGameState(int slot, const Common::String &desc) { + if (!isValidSaveFileName(desc)) + return Common::Error(Common::kCreatingFileFailed, _("Invalid save file name")); + Common::String output = Common::String::format("pegasus-%s.sav", desc.c_str()); Common::OutSaveFile *saveFile = _saveFileMan->openForSaving(output, false); if (!saveFile) @@ -669,19 +691,35 @@ void PegasusEngine::receiveNotification(Notification *notification, const Notifi case kGameStartingFlag: { useMenu(new MainMenu()); - if (!isDemo()) { + if (isDemo()) { + // Start playing the music earlier here + ((MainMenu *)_gameMenu)->startMainMenuLoop(); + + // Show the intro splash screen + showTempScreen("Images/Demo/NGsplashScrn.pict"); + + if (shouldQuit()) { + useMenu(0); + return; + } + + // Fade out and then back in with the main menu + _gfx->doFadeOutSync(); + _gfx->updateDisplay(); + _gfx->doFadeInSync(); + } else { + // Display the intro runIntro(); resetIntroTimer(); - } else { - showTempScreen("Images/Demo/NGsplashScrn.pict"); - } - if (shouldQuit()) - return; + if (shouldQuit()) + return; - _gfx->invalRect(Common::Rect(0, 0, 640, 480)); - _gfx->updateDisplay(); - ((MainMenu *)_gameMenu)->startMainMenuLoop(); + // Now display the main menu + _gfx->invalRect(Common::Rect(0, 0, 640, 480)); + _gfx->updateDisplay(); + ((MainMenu *)_gameMenu)->startMainMenuLoop(); + } break; } case kPlayerDiedFlag: diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h index a8f2e1ffca..246414a9d0 100644 --- a/engines/pegasus/pegasus.h +++ b/engines/pegasus/pegasus.h @@ -30,6 +30,7 @@ #include "common/macresman.h" #include "common/rect.h" #include "common/scummsys.h" +#include "common/str-array.h" #include "common/system.h" #include "common/util.h" @@ -195,6 +196,7 @@ public: bool saveRequested() const { return _saveRequested; } void requestLoad() { _loadRequested = true; } bool loadRequested() const { return _loadRequested; } + static Common::StringArray listSaveFiles(); protected: Common::Error run(); diff --git a/engines/pegasus/timers.cpp b/engines/pegasus/timers.cpp index 3b875038cc..50cc9bc6d8 100644 --- a/engines/pegasus/timers.cpp +++ b/engines/pegasus/timers.cpp @@ -73,13 +73,8 @@ TimeBase::TimeBase(const TimeScale preferredScale) { } TimeBase::~TimeBase() { - if (_master) - _master->_slaves.remove(this); - ((PegasusEngine *)g_engine)->removeTimeBase(this); disposeAllCallBacks(); - - // TODO: Remove slaves? Make them remove themselves? } void TimeBase::setTime(const TimeValue time, const TimeScale scale) { @@ -88,20 +83,23 @@ void TimeBase::setTime(const TimeValue time, const TimeScale scale) { } TimeValue TimeBase::getTime(const TimeScale scale) { + // HACK: Emulate the master TimeBase code here for the one case that needs it in the + // game. Note that none of the master TimeBase code in this file should actually be + // used as a reference for anything ever. + if (_master) + return _master->getTime(scale); + return _time.getNumerator() * ((scale == 0) ? _preferredScale : scale) / _time.getDenominator(); } void TimeBase::setRate(const Common::Rational rate) { _rate = rate; + _lastMillis = 0; if (_rate == 0) _paused = false; } -Common::Rational TimeBase::getEffectiveRate() const { - return _rate * ((_master == 0) ? 1 : _master->getEffectiveRate()); -} - void TimeBase::start() { if (_paused) _pausedRate = 1; @@ -192,18 +190,15 @@ TimeValue TimeBase::getDuration(const TimeScale scale) const { } void TimeBase::setMasterTimeBase(TimeBase *tb) { - // TODO: We're just ignoring the master (except for effective rate) - // for now to simplify things - if (_master) - _master->_slaves.remove(this); - _master = tb; - - if (_master) - _master->_slaves.push_back(this); } void TimeBase::updateTime() { + if (_master) { + _master->updateTime(); + return; + } + if (_lastMillis == 0) { _lastMillis = g_system->getMillis(); } else { @@ -211,7 +206,7 @@ void TimeBase::updateTime() { if (_lastMillis == curTime) // No change return; - _time += Common::Rational(curTime - _lastMillis, 1000) * getEffectiveRate(); + _time += Common::Rational(curTime - _lastMillis, 1000) * getRate(); _lastMillis = curTime; } } @@ -233,8 +228,6 @@ void TimeBase::checkCallBacks() { else if (_time <= startTime) _time = startTime; - // TODO: Update the slaves? - Common::Rational time = Common::Rational(getTime(), getScale()); // Check if we've triggered any callbacks diff --git a/engines/pegasus/timers.h b/engines/pegasus/timers.h index bcdca6e860..944930d21b 100644 --- a/engines/pegasus/timers.h +++ b/engines/pegasus/timers.h @@ -26,7 +26,6 @@ #ifndef PEGASUS_TIMERS_H #define PEGASUS_TIMERS_H -#include "common/list.h" #include "common/rational.h" #include "common/func.h" @@ -122,11 +121,6 @@ protected: Common::Rational _time; uint32 _lastMillis, _pauseStart; - -private: - Common::Rational getEffectiveRate() const; - - Common::List<TimeBase *> _slaves; }; // Type passed to initCallBack() diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index dd01a7efcf..6731a51e04 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -771,4 +771,4 @@ bool AmigaSound::playSpecialSfx(int16 sfx) { return true; } -} //End of namespace Queen +} // End of namespace Queen diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 7782ab4e48..a76b3b3876 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -116,7 +116,7 @@ void SoundCommandParser::processInitSound(reg_t obj) { newSound->resourceId = resourceId; newSound->soundObj = obj; newSound->loop = readSelectorValue(_segMan, obj, SELECTOR(loop)); - newSound->priority = readSelectorValue(_segMan, obj, SELECTOR(pri)) & 0xFF; + newSound->priority = readSelectorValue(_segMan, obj, SELECTOR(priority)) & 0xFF; if (_soundVersion >= SCI_VERSION_1_EARLY) newSound->volume = CLIP<int>(readSelectorValue(_segMan, obj, SELECTOR(vol)), 0, MUSIC_VOLUME_MAX); newSound->reverb = -1; // initialize to SCI invalid, it'll be set correctly in soundInitSnd() below @@ -441,7 +441,7 @@ reg_t SoundCommandParser::kDoSoundUpdate(int argc, reg_t *argv, reg_t acc) { int16 objVol = CLIP<int>(readSelectorValue(_segMan, obj, SELECTOR(vol)), 0, 255); if (objVol != musicSlot->volume) _music->soundSetVolume(musicSlot, objVol); - uint32 objPrio = readSelectorValue(_segMan, obj, SELECTOR(pri)); + uint32 objPrio = readSelectorValue(_segMan, obj, SELECTOR(priority)); if (objPrio != musicSlot->priority) _music->soundSetPriority(musicSlot, objPrio); return acc; diff --git a/engines/scumm/player_v3m.cpp b/engines/scumm/player_v3m.cpp index e61463128a..0f222d84fe 100644 --- a/engines/scumm/player_v3m.cpp +++ b/engines/scumm/player_v3m.cpp @@ -147,7 +147,19 @@ bool Player_V3M::loadMusic(const byte *ptr) { return false; } - assert(ptr[4] == 's' && ptr[5] == 'o'); + if (ptr[4] != 's' || ptr[5] != 'o') { + // Like the original we ignore all sound resources which do not have + // a 'so' tag in them. + // See bug #3602239 ("Mac Loom crashes using opening spell on + // gravestone") for a case where this is required. Loom Mac tries to + // play resource 11 here. This resource is no Mac sound resource + // though, it is a PC Speaker resource. A test with the original + // interpreter also has shown that no sound is played while the + // screen is shaking. + debug(5, "Player_V3M::loadMusic: Skipping unknown music type %02X%02X", ptr[4], ptr[5]); + resource.close(); + return false; + } uint i; for (i = 0; i < 5; i++) { diff --git a/engines/sword25/util/lua/ldo.cpp b/engines/sword25/util/lua/ldo.cpp index 5d9667f4f0..c162a62e98 100644 --- a/engines/sword25/util/lua/ldo.cpp +++ b/engines/sword25/util/lua/ldo.cpp @@ -6,12 +6,10 @@ // FIXME: LUAI_THROW and LUAI_TRY use either throw/catch or setjmp/longjmp. -// Neither of these is supported in ScummVM. So we need to come up -// with a replacement. The most simple, direct and crude approach: -// Replace "throw" with an "error()" call. Of course we only -// would want to do that if this actually never happens... -#define FORBIDDEN_SYMBOL_EXCEPTION_setjmp -#define FORBIDDEN_SYMBOL_EXCEPTION_longjmp +// Neither of these is supported in ScummVM. Calls to LUAI_THROW have been +// replaced with error() in ScummVM, but the calls to LUAI_TRY remain +#define FORBIDDEN_SYMBOL_EXCEPTION_setjmp // for LUAI_TRY, i.e. try() +#define FORBIDDEN_SYMBOL_EXCEPTION_longjmp // for LUAI_TRY and LUAI_THROW, i.e. throw() #include "common/textconsole.h" @@ -103,12 +101,10 @@ static void resetstack (lua_State *L, int status) { void luaD_throw (lua_State *L, int errcode) { if (L->errorJmp) { L->errorJmp->status = errcode; - // FIXME: LUAI_THROW and LUAI_TRY use either throw/catch or setjmp/longjmp. - // Neither of these is supported in ScummVM. So we need to come up - // with a replacement. The most simple, direct and crude approach: - // Replace "throw" with an "error()" call. Of course we only - // would want to do that if this actually never happens... - LUAI_THROW(L, L->errorJmp); + // LUAI_THROW has been replaced with an error message in ScummVM, together + // with the LUA error code and description + //LUAI_THROW(L, L->errorJmp); + error("LUA error occured, error code is %d (%s)", errcode, luaErrorDescription[errcode]); } else { L->status = cast_byte(errcode); @@ -129,9 +125,8 @@ int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) { L->errorJmp = &lj; // FIXME: LUAI_THROW and LUAI_TRY use either throw/catch or setjmp/longjmp. // Neither of these is supported in ScummVM. So we need to come up - // with a replacement. The most simple, direct and crude approach: - // Replace "throw" with an "error()" call. Of course we only - // would want to do that if this actually never happens... + // with a replacement. Calls to LUAI_THROW have been replaced with error() + // in ScummVM, but the calls to LUAI_TRY remain LUAI_TRY(L, &lj, (*f)(L, ud); ); diff --git a/engines/sword25/util/lua/lua.h b/engines/sword25/util/lua/lua.h index 08ad80d70f..768ec1ad74 100644 --- a/engines/sword25/util/lua/lua.h +++ b/engines/sword25/util/lua/lua.h @@ -48,6 +48,15 @@ #define LUA_ERRMEM 4 #define LUA_ERRERR 5 +// Added in ScummVM. Refer to http://www.lua.org/manual/5.1/manual.html +static const char* luaErrorDescription[] = { + "No error", + "Coroutine yield", // not an actual error, see lua_resume + "Runtime error", + "Syntax error during pre-compilation", // refer to lua_load + "Memory allocation error", + "Error while running the error handler function" +}; typedef struct lua_State lua_State; diff --git a/engines/sword25/util/lua/luaconf.h b/engines/sword25/util/lua/luaconf.h index 53d0f55290..fb85983998 100644 --- a/engines/sword25/util/lua/luaconf.h +++ b/engines/sword25/util/lua/luaconf.h @@ -621,7 +621,7 @@ union luai_Cast { double l_d; long l_l; }; #else /* default handling with long jumps */ -#define LUAI_THROW(L,c) longjmp((c)->b, 1) +//#define LUAI_THROW(L,c) longjmp((c)->b, 1) // replaced with error() in ScummVM #define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a } #define luai_jmpbuf jmp_buf diff --git a/engines/testbed/config-params.cpp b/engines/testbed/config-params.cpp index d7ead48f63..e89da0b07f 100644 --- a/engines/testbed/config-params.cpp +++ b/engines/testbed/config-params.cpp @@ -69,4 +69,4 @@ void ConfigParams::deleteWriteStream() { } } -} // End of namespace Testbed +} // End of namespace Testbed diff --git a/engines/testbed/config.cpp b/engines/testbed/config.cpp index 6bd4c82b41..6b56616c9b 100644 --- a/engines/testbed/config.cpp +++ b/engines/testbed/config.cpp @@ -304,4 +304,4 @@ void TestbedConfigManager::selectTestsuites() { _configFileInterface.clear(); } -} // End of namespace Testbed +} // End of namespace Testbed diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp index bb7ae2c055..5af1d8ca31 100644 --- a/engines/testbed/sound.cpp +++ b/engines/testbed/sound.cpp @@ -277,4 +277,4 @@ SoundSubsystemTestSuite::SoundSubsystemTestSuite() { addTest("SampleRates", &SoundSubsystem::sampleRates, true); } -} // End of namespace Testbed +} // End of namespace Testbed diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp index 4016becb82..788f813762 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -324,7 +324,7 @@ SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, in } return SaveStateDescriptor(); -} // End of namespace Toltecs +} // End of namespace Toltecs #if PLUGIN_ENABLED_DYNAMIC(TOLTECS) REGISTER_PLUGIN_DYNAMIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngine); diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp index 74fb4a5ae2..1346a090f6 100644 --- a/engines/wintermute/ad/ad_actor.cpp +++ b/engines/wintermute/ad/ad_actor.cpp @@ -57,15 +57,15 @@ AdActor::AdActor(BaseGame *inGame) : AdTalkHolder(inGame) { _type = OBJECT_ACTOR; _dir = DI_LEFT; - _walkSprite = NULL; - _standSprite = NULL; - _turnLeftSprite = NULL; - _turnRightSprite = NULL; + _walkSprite = nullptr; + _standSprite = nullptr; + _turnLeftSprite = nullptr; + _turnRightSprite = nullptr; _targetPoint = new BasePoint; _afterWalkDir = DI_NONE; - _animSprite2 = NULL; + _animSprite2 = nullptr; setDefaultAnimNames(); } @@ -84,19 +84,19 @@ bool AdActor::setDefaultAnimNames() { AdActor::~AdActor() { delete _path; delete _targetPoint; - _path = NULL; - _targetPoint = NULL; + _path = nullptr; + _targetPoint = nullptr; delete _walkSprite; delete _standSprite; delete _turnLeftSprite; delete _turnRightSprite; - _walkSprite = NULL; - _standSprite = NULL; - _turnLeftSprite = NULL; - _turnRightSprite = NULL; + _walkSprite = nullptr; + _standSprite = nullptr; + _turnLeftSprite = nullptr; + _turnRightSprite = nullptr; - _animSprite2 = NULL; // ref only + _animSprite2 = nullptr; // ref only for (uint32 i = 0; i < _talkSprites.size(); i++) { delete _talkSprites[i]; @@ -110,7 +110,7 @@ AdActor::~AdActor() { for (uint32 i = 0; i < _anims.size(); i++) { delete _anims[i]; - _anims[i] = NULL; + _anims[i] = nullptr; } _anims.clear(); @@ -120,7 +120,7 @@ AdActor::~AdActor() { ////////////////////////////////////////////////////////////////////////// bool AdActor::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdActor::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -232,7 +232,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { } AdGame *adGame = (AdGame *)_gameRef; - AdSpriteSet *spr = NULL; + AdSpriteSet *spr = nullptr; int ar = 0, ag = 0, ab = 0, alpha = 0; while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { switch (cmd) { @@ -287,7 +287,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_WALK: delete _walkSprite; - _walkSprite = NULL; + _walkSprite = nullptr; spr = new AdSpriteSet(_gameRef, this); if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texWalkLifeTime, CACHE_HALF))) { cmd = PARSERR_GENERIC; @@ -316,7 +316,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_STAND: delete _standSprite; - _standSprite = NULL; + _standSprite = nullptr; spr = new AdSpriteSet(_gameRef, this); if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texStandLifeTime))) { cmd = PARSERR_GENERIC; @@ -327,7 +327,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_TURN_LEFT: delete _turnLeftSprite; - _turnLeftSprite = NULL; + _turnLeftSprite = nullptr; spr = new AdSpriteSet(_gameRef, this); if (!spr || DID_FAIL(spr->loadBuffer(params, true))) { cmd = PARSERR_GENERIC; @@ -338,7 +338,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_TURN_RIGHT: delete _turnRightSprite; - _turnRightSprite = NULL; + _turnRightSprite = nullptr; spr = new AdSpriteSet(_gameRef, this); if (!spr || DID_FAIL(spr->loadBuffer(params, true))) { cmd = PARSERR_GENERIC; @@ -356,7 +356,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -392,15 +392,15 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_BLOCKED_REGION: { delete _blockRegion; delete _currentBlockRegion; - _blockRegion = NULL; - _currentBlockRegion = NULL; + _blockRegion = nullptr; + _currentBlockRegion = nullptr; BaseRegion *rgn = new BaseRegion(_gameRef); BaseRegion *crgn = new BaseRegion(_gameRef); if (!rgn || !crgn || DID_FAIL(rgn->loadBuffer(params, false))) { delete _blockRegion; delete _currentBlockRegion; - _blockRegion = NULL; - _currentBlockRegion = NULL; + _blockRegion = nullptr; + _currentBlockRegion = nullptr; cmd = PARSERR_GENERIC; } else { _blockRegion = rgn; @@ -413,15 +413,15 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_WAYPOINTS: { delete _wptGroup; delete _currentWptGroup; - _wptGroup = NULL; - _currentWptGroup = NULL; + _wptGroup = nullptr; + _currentWptGroup = nullptr; AdWaypointGroup *wpt = new AdWaypointGroup(_gameRef); AdWaypointGroup *cwpt = new AdWaypointGroup(_gameRef); if (!wpt || !cwpt || DID_FAIL(wpt->loadBuffer(params, false))) { delete _wptGroup; delete _currentWptGroup; - _wptGroup = NULL; - _currentWptGroup = NULL; + _wptGroup = nullptr; + _currentWptGroup = nullptr; cmd = PARSERR_GENERIC; } else { _wptGroup = wpt; @@ -502,7 +502,7 @@ void AdActor::turnTo(TDirection dir) { _targetDir = dir; _state = delta < 0 ? STATE_TURNING_LEFT : STATE_TURNING_RIGHT; - _tempSprite2 = NULL; + _tempSprite2 = nullptr; } @@ -566,7 +566,7 @@ bool AdActor::display() { _currentSprite->display(_posX, _posY, - reg ? _registerAlias : NULL, + reg ? _registerAlias : nullptr, scaleX, scaleY, alpha, @@ -589,26 +589,26 @@ bool AdActor::display() { ////////////////////////////////////////////////////////////////////////// bool AdActor::update() { - _currentSprite = NULL; + _currentSprite = nullptr; if (_state == STATE_READY) { if (_animSprite) { delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; } if (_animSprite2) { - _animSprite2 = NULL; + _animSprite2 = nullptr; } } // finished playing animation? - if (_state == STATE_PLAYING_ANIM && _animSprite != NULL && _animSprite->isFinished()) { + if (_state == STATE_PLAYING_ANIM && _animSprite != nullptr && _animSprite->isFinished()) { _state = _nextState; _nextState = STATE_READY; _currentSprite = _animSprite; } - if (_state == STATE_PLAYING_ANIM_SET && _animSprite2 != NULL && _animSprite2->isFinished()) { + if (_state == STATE_PLAYING_ANIM_SET && _animSprite2 != nullptr && _animSprite2->isFinished()) { _state = _nextState; _nextState = STATE_READY; _currentSprite = _animSprite2; @@ -649,7 +649,7 @@ bool AdActor::update() { ////////////////////////////////////////////////////////////////////////// case STATE_TURNING_LEFT: - if (_tempSprite2 == NULL || _tempSprite2->isFinished()) { + if (_tempSprite2 == nullptr || _tempSprite2->isFinished()) { if (_dir > 0) { _dir = (TDirection)(_dir - 1); } else { @@ -657,7 +657,7 @@ bool AdActor::update() { } if (_dir == _targetDir) { - _tempSprite2 = NULL; + _tempSprite2 = nullptr; _state = _nextState; _nextState = STATE_READY; } else { @@ -686,7 +686,7 @@ bool AdActor::update() { ////////////////////////////////////////////////////////////////////////// case STATE_TURNING_RIGHT: - if (_tempSprite2 == NULL || _tempSprite2->isFinished()) { + if (_tempSprite2 == nullptr || _tempSprite2->isFinished()) { _dir = (TDirection)(_dir + 1); if ((int)_dir >= (int)NUM_DIRECTIONS) { @@ -694,7 +694,7 @@ bool AdActor::update() { } if (_dir == _targetDir) { - _tempSprite2 = NULL; + _tempSprite2 = nullptr; _state = _nextState; _nextState = STATE_READY; } else { @@ -753,10 +753,10 @@ bool AdActor::update() { } bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime); - if (_tempSprite2 == NULL || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { + if (_tempSprite2 == nullptr || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { if (timeIsUp) { _sentence->finish(); - _tempSprite2 = NULL; + _tempSprite2 = nullptr; _state = _nextState; _nextState = STATE_READY; } else { @@ -821,7 +821,7 @@ bool AdActor::update() { void AdActor::followPath() { // skip current position _path->getFirst(); - while (_path->getCurrent() != NULL) { + while (_path->getCurrent() != nullptr) { if (_path->getCurrent()->x != _posX || _path->getCurrent()->y != _posY) { break; } @@ -829,7 +829,7 @@ void AdActor::followPath() { } // are there points to follow? - if (_path->getCurrent() != NULL) { + if (_path->getCurrent() != nullptr) { _state = STATE_FOLLOWING_PATH; initLine(BasePoint(_posX, _posY), *_path->getCurrent()); } else { @@ -896,7 +896,7 @@ void AdActor::getNextStep() { if (_pFCount == 0) { - if (_path->getNext() == NULL) { + if (_path->getNext() == nullptr) { _posX = _targetPoint->x; _posY = _targetPoint->y; @@ -1040,17 +1040,17 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, if (scumm_stricmp(_anims[i]->getName(), animName) == 0) { // invalidate sprites in use if (_anims[i]->containsSprite(_tempSprite2)) { - _tempSprite2 = NULL; + _tempSprite2 = nullptr; } if (_anims[i]->containsSprite(_currentSprite)) { - _currentSprite = NULL; + _currentSprite = nullptr; } if (_anims[i]->containsSprite(_animSprite2)) { - _animSprite2 = NULL; + _animSprite2 = nullptr; } delete _anims[i]; - _anims[i] = NULL; + _anims[i] = nullptr; _anims.remove_at(i); i--; found = true; @@ -1066,7 +1066,7 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "HasAnim") == 0) { stack->correctParams(1); const char *animName = stack->pop()->getString(); - stack->pushBool(getAnimByName(animName) != NULL); + stack->pushBool(getAnimByName(animName) != nullptr); return STATUS_OK; } else { return AdTalkHolder::scCallMethod(script, stack, thisStack, name); @@ -1231,7 +1231,7 @@ BaseSprite *AdActor::getTalkStance(const char *stance) { if (DID_FAIL(res)) { _gameRef->LOG(res, "AdActor::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", getName(), _forcedTalkAnimName); delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; } else { return _animSprite; } @@ -1244,7 +1244,7 @@ BaseSprite *AdActor::getTalkStance(const char *stance) { } // new way - BaseSprite *ret = NULL; + BaseSprite *ret = nullptr; // do we have an animation with this name? AdSpriteSet *anim = getAnimByName(stance); @@ -1280,9 +1280,9 @@ BaseSprite *AdActor::getTalkStance(const char *stance) { ////////////////////////////////////////////////////////////////////////// BaseSprite *AdActor::getTalkStanceOld(const char *stance) { - BaseSprite *ret = NULL; + BaseSprite *ret = nullptr; - if (stance != NULL) { + if (stance != nullptr) { // search special stances for (uint32 i = 0; i < _talkSpritesEx.size(); i++) { if (scumm_stricmp(_talkSpritesEx[i]->getName(), stance) == 0) { @@ -1290,7 +1290,7 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) { break; } } - if (ret == NULL) { + if (ret == nullptr) { // search generic stances for (uint32 i = 0; i < _talkSprites.size(); i++) { if (scumm_stricmp(_talkSprites[i]->getName(), stance) == 0) { @@ -1302,7 +1302,7 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) { } // not a valid stance? get a random one - if (ret == NULL) { + if (ret == nullptr) { if (_talkSprites.size() < 1) { ret = _standSprite->getSprite(_dir); } else { @@ -1378,7 +1378,7 @@ TDirection AdActor::angleToDirection(int angle) { ////////////////////////////////////////////////////////////////////////// int AdActor::getHeight() { // if no current sprite is set, set some - if (_currentSprite == NULL) { + if (_currentSprite == nullptr) { if (_standSprite) { _currentSprite = _standSprite->getSprite(_dir); } else { @@ -1400,7 +1400,7 @@ AdSpriteSet *AdActor::getAnimByName(const Common::String &animName) { return _anims[i]; } } - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -1411,7 +1411,7 @@ bool AdActor::mergeAnims(const char *animsFilename) { byte *fileBuffer = BaseFileManager::getEngineInstance()->readWholeFile(animsFilename); - if (fileBuffer == NULL) { + if (fileBuffer == nullptr) { _gameRef->LOG(0, "AdActor::MergeAnims failed for file '%s'", animsFilename); return STATUS_FAILED; } diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h index 543c9d063a..bcec9db319 100644 --- a/engines/wintermute/ad/ad_actor.h +++ b/engines/wintermute/ad/ad_actor.h @@ -54,7 +54,7 @@ public: virtual bool update(); virtual bool display(); virtual void turnTo(TDirection dir); - AdActor(BaseGame *inGame/*=NULL*/); + AdActor(BaseGame *inGame/*=nullptr*/); virtual ~AdActor(); bool loadFile(const char *filename); bool loadBuffer(byte *buffer, bool complete = true); diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp index 2c331de964..259b68f291 100644 --- a/engines/wintermute/ad/ad_entity.cpp +++ b/engines/wintermute/ad/ad_entity.cpp @@ -61,13 +61,13 @@ IMPLEMENT_PERSISTENT(AdEntity, false) AdEntity::AdEntity(BaseGame *inGame) : AdTalkHolder(inGame) { _type = OBJECT_ENTITY; _subtype = ENTITY_NORMAL; - _region = NULL; - _item = NULL; + _region = nullptr; + _item = nullptr; _walkToX = _walkToY = 0; _walkToDir = DI_NONE; - _theora = NULL; + _theora = nullptr; } @@ -76,10 +76,10 @@ AdEntity::~AdEntity() { _gameRef->unregisterObject(_region); delete _theora; - _theora = NULL; + _theora = nullptr; delete[] _item; - _item = NULL; + _item = nullptr; } int32 AdEntity::getWalkToX() const { @@ -101,7 +101,7 @@ const char *AdEntity::getItemName() const { ////////////////////////////////////////////////////////////////////////// bool AdEntity::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdEntity::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -225,7 +225,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { } AdGame *adGame = (AdGame *)_gameRef; - BaseSprite *spr = NULL; + BaseSprite *spr = nullptr; int ar = 0, ag = 0, ab = 0, alpha = 0; while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { switch (cmd) { @@ -245,7 +245,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { case TOKEN_SPRITE: { delete _sprite; - _sprite = NULL; + _sprite = nullptr; spr = new BaseSprite(_gameRef, this); if (!spr || DID_FAIL(spr->loadFile((char *)params))) { cmd = PARSERR_GENERIC; @@ -335,7 +335,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -348,7 +348,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { if (_region) { _gameRef->unregisterObject(_region); } - _region = NULL; + _region = nullptr; BaseRegion *rgn = new BaseRegion(_gameRef); if (!rgn || DID_FAIL(rgn->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; @@ -361,16 +361,16 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { case TOKEN_BLOCKED_REGION: { delete _blockRegion; - _blockRegion = NULL; + _blockRegion = nullptr; delete _currentBlockRegion; - _currentBlockRegion = NULL; + _currentBlockRegion = nullptr; BaseRegion *rgn = new BaseRegion(_gameRef); BaseRegion *crgn = new BaseRegion(_gameRef); if (!rgn || !crgn || DID_FAIL(rgn->loadBuffer(params, false))) { delete _blockRegion; - _blockRegion = NULL; + _blockRegion = nullptr; delete _currentBlockRegion; - _currentBlockRegion = NULL; + _currentBlockRegion = nullptr; cmd = PARSERR_GENERIC; } else { _blockRegion = rgn; @@ -382,16 +382,16 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { case TOKEN_WAYPOINTS: { delete _wptGroup; - _wptGroup = NULL; + _wptGroup = nullptr; delete _currentWptGroup; - _currentWptGroup = NULL; + _currentWptGroup = nullptr; AdWaypointGroup *wpt = new AdWaypointGroup(_gameRef); AdWaypointGroup *cwpt = new AdWaypointGroup(_gameRef); if (!wpt || !cwpt || DID_FAIL(wpt->loadBuffer(params, false))) { delete _wptGroup; - _wptGroup = NULL; + _wptGroup = nullptr; delete _currentWptGroup; - _currentWptGroup = NULL; + _currentWptGroup = nullptr; cmd = PARSERR_GENERIC; } else { _wptGroup = wpt; @@ -408,7 +408,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { case TOKEN_SUBTYPE: { if (scumm_stricmp((char *)params, "sound") == 0) { delete _sprite; - _sprite = NULL; + _sprite = nullptr; if (_gameRef->_editorMode) { spr = new BaseSprite(_gameRef, this); if (!spr || DID_FAIL(spr->loadFile("entity_sound.sprite"))) { @@ -565,7 +565,7 @@ bool AdEntity::display() { } else if (_currentSprite) { _currentSprite->display(_posX, _posY, - (reg || _editorAlwaysRegister) ? _registerAlias : NULL, + (reg || _editorAlwaysRegister) ? _registerAlias : nullptr, scaleX, scaleY, alpha, @@ -585,15 +585,15 @@ bool AdEntity::display() { ////////////////////////////////////////////////////////////////////////// bool AdEntity::update() { - _currentSprite = NULL; + _currentSprite = nullptr; if (_state == STATE_READY && _animSprite) { delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; } // finished playing animation? - if (_state == STATE_PLAYING_ANIM && _animSprite != NULL && _animSprite->isFinished()) { + if (_state == STATE_PLAYING_ANIM && _animSprite != nullptr && _animSprite->isFinished()) { _state = STATE_READY; _currentSprite = _animSprite; } @@ -628,10 +628,10 @@ bool AdEntity::update() { } bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime); - if (_tempSprite2 == NULL || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { + if (_tempSprite2 == nullptr || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { if (timeIsUp) { _sentence->finish(); - _tempSprite2 = NULL; + _tempSprite2 = nullptr; _state = STATE_READY; } else { _tempSprite2 = getTalkStance(_sentence->getNextStance()); @@ -673,7 +673,7 @@ bool AdEntity::update() { if (_theora->isFinished()) { _theora->stop(); delete _theora; - _theora = NULL; + _theora = nullptr; } } @@ -737,7 +737,7 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack if (_theora) { _theora->stop(); delete _theora; - _theora = NULL; + _theora = nullptr; stack->pushBool(true); } else { stack->pushBool(false); @@ -830,7 +830,7 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack stack->correctParams(0); if (_region) { _gameRef->unregisterObject(_region); - _region = NULL; + _region = nullptr; stack->pushBool(true); } else { stack->pushBool(false); @@ -1071,7 +1071,7 @@ int AdEntity::getHeight() { if (_region && !_sprite) { return _region->_rect.bottom - _region->_rect.top; } else { - if (_currentSprite == NULL) { + if (_currentSprite == nullptr) { _currentSprite = _sprite; } return AdObject::getHeight(); @@ -1117,15 +1117,15 @@ void AdEntity::setItem(const char *itemName) { ////////////////////////////////////////////////////////////////////////// bool AdEntity::setSprite(const char *filename) { if (_currentSprite == _sprite) { - _currentSprite = NULL; + _currentSprite = nullptr; } delete _sprite; - _sprite = NULL; + _sprite = nullptr; BaseSprite *spr = new BaseSprite(_gameRef, this); if (!spr || DID_FAIL(spr->loadFile(filename))) { delete _sprite; - _sprite = NULL; + _sprite = nullptr; return STATUS_FAILED; } else { _sprite = spr; diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp index 29e932a586..b9775ba7d1 100644 --- a/engines/wintermute/ad/ad_game.cpp +++ b/engines/wintermute/ad/ad_game.cpp @@ -69,22 +69,22 @@ IMPLEMENT_PERSISTENT(AdGame, true) ////////////////////////////////////////////////////////////////////////// AdGame::AdGame(const Common::String &gameId) : BaseGame(gameId) { - _responseBox = NULL; - _inventoryBox = NULL; + _responseBox = nullptr; + _inventoryBox = nullptr; _scene = new AdScene(_gameRef); _scene->setName(""); registerObject(_scene); - _prevSceneName = NULL; - _prevSceneFilename = NULL; - _scheduledScene = NULL; + _prevSceneName = nullptr; + _prevSceneFilename = nullptr; + _scheduledScene = nullptr; _scheduledFadeIn = false; _stateEx = GAME_NORMAL; - _selectedItem = NULL; + _selectedItem = nullptr; _texItemLifeTime = 10000; @@ -94,17 +94,17 @@ AdGame::AdGame(const Common::String &gameId) : BaseGame(gameId) { _talkSkipButton = TALK_SKIP_LEFT; - _sceneViewport = NULL; + _sceneViewport = nullptr; _initialScene = true; - _debugStartupScene = NULL; - _startupScene = NULL; + _debugStartupScene = nullptr; + _startupScene = nullptr; _invObject = new AdObject(this); _inventoryOwner = _invObject; _tempDisableSaveState = false; - _itemsFile = NULL; + _itemsFile = nullptr; _smartItemCursor = false; @@ -122,7 +122,7 @@ AdGame::~AdGame() { bool AdGame::cleanup() { for (uint32 i = 0; i < _objects.size(); i++) { unregisterObject(_objects[i]); - _objects[i] = NULL; + _objects[i] = nullptr; } _objects.clear(); @@ -139,7 +139,7 @@ bool AdGame::cleanup() { unregisterObject(_scene); - _scene = NULL; + _scene = nullptr; // remove items for (uint32 i = 0; i < _items.size(); i++) { @@ -150,7 +150,7 @@ bool AdGame::cleanup() { // clear remaining inventories delete _invObject; - _invObject = NULL; + _invObject = nullptr; for (uint32 i = 0; i < _inventories.size(); i++) { delete _inventories[i]; @@ -160,12 +160,12 @@ bool AdGame::cleanup() { if (_responseBox) { _gameRef->unregisterObject(_responseBox); - _responseBox = NULL; + _responseBox = nullptr; } if (_inventoryBox) { _gameRef->unregisterObject(_inventoryBox); - _inventoryBox = NULL; + _inventoryBox = nullptr; } delete[] _prevSceneName; @@ -173,15 +173,15 @@ bool AdGame::cleanup() { delete[] _scheduledScene; delete[] _debugStartupScene; delete[] _itemsFile; - _prevSceneName = NULL; - _prevSceneFilename = NULL; - _scheduledScene = NULL; - _debugStartupScene = NULL; - _startupScene = NULL; - _itemsFile = NULL; + _prevSceneName = nullptr; + _prevSceneFilename = nullptr; + _scheduledScene = nullptr; + _debugStartupScene = nullptr; + _startupScene = nullptr; + _itemsFile = nullptr; delete _sceneViewport; - _sceneViewport = NULL; + _sceneViewport = nullptr; for (uint32 i = 0; i < _sceneStates.size(); i++) { delete _sceneStates[i]; @@ -207,9 +207,9 @@ bool AdGame::initLoop() { if (_scheduledScene && _transMgr->isReady()) { changeScene(_scheduledScene, _scheduledFadeIn); delete[] _scheduledScene; - _scheduledScene = NULL; + _scheduledScene = nullptr; - _gameRef->_activeObject = NULL; + _gameRef->_activeObject = nullptr; } @@ -258,7 +258,7 @@ bool AdGame::removeObject(AdObject *object) { ////////////////////////////////////////////////////////////////////////// bool AdGame::changeScene(const char *filename, bool fadeIn) { - if (_scene == NULL) { + if (_scene == nullptr) { _scene = new AdScene(_gameRef); registerObject(_scene); } else { @@ -297,7 +297,7 @@ bool AdGame::changeScene(const char *filename, bool fadeIn) { // invalidate references to the original scene for (uint32 i = 0; i < _objects.size(); i++) { _objects[i]->invalidateCurrRegions(); - _objects[i]->_stickRegion = NULL; + _objects[i]->_stickRegion = nullptr; } _scene->loadState(); @@ -385,7 +385,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->pushNative(act, true); } else { delete act; - act = NULL; + act = nullptr; stack->pushNULL(); } return STATUS_OK; @@ -402,7 +402,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->pushNative(ent, true); } else { delete ent; - ent = NULL; + ent = nullptr; stack->pushNULL(); } return STATUS_OK; @@ -463,7 +463,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1); ScValue *val = stack->pop(); - AdItem *item = NULL; + AdItem *item = nullptr; if (val->isNative()) { item = (AdItem *)val->getNative(); } else { @@ -485,7 +485,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1); ScValue *val = stack->pop(); - AdItem *item = NULL; + AdItem *item = nullptr; if (val->isInt()) { int index = val->getInt(); if (index >= 0 && index < (int32)_items.size()) { @@ -639,7 +639,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, branchName = val->getString(); } - startDlgBranch(branchName.c_str(), script->_filename == NULL ? "" : script->_filename, script->_threadEvent == NULL ? "" : script->_threadEvent); + startDlgBranch(branchName.c_str(), script->_filename == nullptr ? "" : script->_filename, script->_threadEvent == nullptr ? "" : script->_threadEvent); stack->pushNULL(); return STATUS_OK; @@ -651,12 +651,12 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "EndDlgBranch") == 0) { stack->correctParams(1); - const char *branchName = NULL; + const char *branchName = nullptr; ScValue *val = stack->pop(); if (!val->isNULL()) { branchName = val->getString(); } - endDlgBranch(branchName, script->_filename == NULL ? "" : script->_filename, script->_threadEvent == NULL ? "" : script->_threadEvent); + endDlgBranch(branchName, script->_filename == nullptr ? "" : script->_filename, script->_threadEvent == nullptr ? "" : script->_threadEvent); stack->pushNULL(); @@ -777,7 +777,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->pushBool(true); } else { delete _responseBox; - _responseBox = NULL; + _responseBox = nullptr; stack->pushBool(false); } return STATUS_OK; @@ -797,7 +797,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->pushBool(true); } else { delete _inventoryBox; - _inventoryBox = NULL; + _inventoryBox = nullptr; stack->pushBool(false); } return STATUS_OK; @@ -1036,7 +1036,7 @@ ScValue *AdGame::scGetProperty(const Common::String &name) { // ChangingScene ////////////////////////////////////////////////////////////////////////// else if (name == "ChangingScene") { - _scValue->setBool(_scheduledScene != NULL); + _scValue->setBool(_scheduledScene != nullptr); return _scValue; } @@ -1066,10 +1066,10 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { ////////////////////////////////////////////////////////////////////////// if (strcmp(name, "SelectedItem") == 0) { if (value->isNULL()) { - _selectedItem = NULL; + _selectedItem = nullptr; } else { if (value->isNative()) { - _selectedItem = NULL; + _selectedItem = nullptr; for (uint32 i = 0; i < _items.size(); i++) { if (_items[i] == value->getNative()) { _selectedItem = (AdItem *)value->getNative(); @@ -1158,9 +1158,9 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { // StartupScene ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "StartupScene") == 0) { - if (value == NULL) { + if (value == nullptr) { delete[] _startupScene; - _startupScene = NULL; + _startupScene = nullptr; } else { BaseUtils::setString(&_startupScene, value->getString()); } @@ -1242,7 +1242,7 @@ bool AdGame::showCursor() { ////////////////////////////////////////////////////////////////////////// bool AdGame::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdGame::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -1316,7 +1316,7 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { registerObject(_responseBox); } else { delete _responseBox; - _responseBox = NULL; + _responseBox = nullptr; cmd = PARSERR_GENERIC; } break; @@ -1328,7 +1328,7 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { registerObject(_inventoryBox); } else { delete _inventoryBox; - _inventoryBox = NULL; + _inventoryBox = nullptr; cmd = PARSERR_GENERIC; } break; @@ -1338,7 +1338,7 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { BaseUtils::setString(&_itemsFile, (char *)params2); if (DID_FAIL(loadItemsFile(_itemsFile))) { delete[] _itemsFile; - _itemsFile = NULL; + _itemsFile = nullptr; cmd = PARSERR_GENERIC; } break; @@ -1456,7 +1456,7 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { ////////////////////////////////////////////////////////////////////////// void AdGame::setPrevSceneName(const char *name) { delete[] _prevSceneName; - _prevSceneName = NULL; + _prevSceneName = nullptr; if (name) { _prevSceneName = new char[strlen(name) + 1]; if (_prevSceneName) { @@ -1469,7 +1469,7 @@ void AdGame::setPrevSceneName(const char *name) { ////////////////////////////////////////////////////////////////////////// void AdGame::setPrevSceneFilename(const char *name) { delete[] _prevSceneFilename; - _prevSceneFilename = NULL; + _prevSceneFilename = nullptr; if (name) { _prevSceneFilename = new char[strlen(name) + 1]; if (_prevSceneFilename) { @@ -1482,7 +1482,7 @@ void AdGame::setPrevSceneFilename(const char *name) { ////////////////////////////////////////////////////////////////////////// bool AdGame::scheduleChangeScene(const char *filename, bool fadeIn) { delete[] _scheduledScene; - _scheduledScene = NULL; + _scheduledScene = nullptr; if (_scene && !_scene->_initialized) { return changeScene(filename, fadeIn); @@ -1499,7 +1499,7 @@ bool AdGame::scheduleChangeScene(const char *filename, bool fadeIn) { ////////////////////////////////////////////////////////////////////////// bool AdGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) { - BaseGame::getVersion(verMajor, verMinor, NULL, NULL); + BaseGame::getVersion(verMajor, verMinor, nullptr, nullptr); if (extMajor) { *extMajor = 0; @@ -1515,7 +1515,7 @@ bool AdGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *ex ////////////////////////////////////////////////////////////////////////// bool AdGame::loadItemsFile(const char *filename, bool merge) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdGame::LoadItemsFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -1567,7 +1567,7 @@ bool AdGame::loadItemsBuffer(byte *buffer, bool merge) { addItem(item); } else { delete item; - item = NULL; + item = nullptr; cmd = PARSERR_GENERIC; } } @@ -1615,7 +1615,7 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) { return ret; } else { delete[] filenameCor; - return NULL; + return nullptr; } } @@ -1635,7 +1635,7 @@ bool AdGame::windowLoadHook(UIWindow *win, char **buffer, char **params) { UIEntity *ent = new UIEntity(_gameRef); if (!ent || DID_FAIL(ent->loadBuffer((byte *)*params, false))) { delete ent; - ent = NULL; + ent = nullptr; cmd = PARSERR_GENERIC; } else { ent->_parent = win; @@ -1689,12 +1689,12 @@ bool AdGame::startDlgBranch(const char *branchName, const char *scriptName, cons ////////////////////////////////////////////////////////////////////////// bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const char *eventName) { - char *name = NULL; + char *name = nullptr; bool deleteName = false; - if (branchName == NULL && _dlgPendingBranches.size() > 0) { + if (branchName == nullptr && _dlgPendingBranches.size() > 0) { name = _dlgPendingBranches[_dlgPendingBranches.size() - 1]; } else { - if (branchName != NULL) { + if (branchName != nullptr) { name = new char[strlen(branchName) + 1 + strlen(scriptName) + 1 + strlen(eventName) + 1]; if (name) { sprintf(name, "%s.%s.%s", branchName, scriptName, eventName); @@ -1703,7 +1703,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const } } - if (name == NULL) { + if (name == nullptr) { return STATUS_OK; } @@ -1719,7 +1719,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const for (uint32 i = startIndex; i < _dlgPendingBranches.size(); i++) { //ClearBranchResponses(_dlgPendingBranches[i]); delete[] _dlgPendingBranches[i]; - _dlgPendingBranches[i] = NULL; + _dlgPendingBranches[i] = nullptr; } _dlgPendingBranches.remove_at(startIndex, _dlgPendingBranches.size() - startIndex); } @@ -1760,7 +1760,7 @@ bool AdGame::addBranchResponse(int id) { } AdResponseContext *r = new AdResponseContext(_gameRef); r->_id = id; - r->setContext(_dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL); + r->setContext(_dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : nullptr); _responsesBranch.add(r); return STATUS_OK; } @@ -1768,10 +1768,10 @@ bool AdGame::addBranchResponse(int id) { ////////////////////////////////////////////////////////////////////////// bool AdGame::branchResponseUsed(int id) { - char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL; + char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : nullptr; for (uint32 i = 0; i < _responsesBranch.size(); i++) { if (_responsesBranch[i]->_id == id) { - if ((context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) { + if ((context == nullptr && _responsesBranch[i]->_context == nullptr) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) { return true; } } @@ -1787,7 +1787,7 @@ bool AdGame::addGameResponse(int id) { } AdResponseContext *r = new AdResponseContext(_gameRef); r->_id = id; - r->setContext(_dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL); + r->setContext(_dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : nullptr); _responsesGame.add(r); return STATUS_OK; } @@ -1795,11 +1795,11 @@ bool AdGame::addGameResponse(int id) { ////////////////////////////////////////////////////////////////////////// bool AdGame::gameResponseUsed(int id) { - char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL; + char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : nullptr; for (uint32 i = 0; i < _responsesGame.size(); i++) { AdResponseContext *respContext = _responsesGame[i]; if (respContext->_id == id) { - if ((context == NULL && respContext->_context == NULL) || ((context != NULL && respContext->_context != NULL) && scumm_stricmp(context, respContext->_context) == 0)) { + if ((context == nullptr && respContext->_context == nullptr) || ((context != nullptr && respContext->_context != nullptr) && scumm_stricmp(context, respContext->_context) == 0)) { return true; } } @@ -1810,11 +1810,11 @@ bool AdGame::gameResponseUsed(int id) { ////////////////////////////////////////////////////////////////////////// bool AdGame::resetResponse(int id) { - char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL; + char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : nullptr; for (uint32 i = 0; i < _responsesGame.size(); i++) { if (_responsesGame[i]->_id == id) { - if ((context == NULL && _responsesGame[i]->_context == NULL) || scumm_stricmp(context, _responsesGame[i]->_context) == 0) { + if ((context == nullptr && _responsesGame[i]->_context == nullptr) || scumm_stricmp(context, _responsesGame[i]->_context) == 0) { delete _responsesGame[i]; _responsesGame.remove_at(i); break; @@ -1824,7 +1824,7 @@ bool AdGame::resetResponse(int id) { for (uint32 i = 0; i < _responsesBranch.size(); i++) { if (_responsesBranch[i]->_id == id) { - if ((context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) { + if ((context == nullptr && _responsesBranch[i]->_context == nullptr) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) { delete _responsesBranch[i]; _responsesBranch.remove_at(i); break; @@ -1863,7 +1863,7 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) { } if (_theoraPlayer->isFinished()) { delete _theoraPlayer; - _theoraPlayer = NULL; + _theoraPlayer = nullptr; } } else { @@ -1912,7 +1912,7 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) { _loadingIcon->display(_loadingIconX, _loadingIconY); if (!_loadingIconPersistent) { delete _loadingIcon; - _loadingIcon = NULL; + _loadingIcon = nullptr; } } @@ -1965,7 +1965,7 @@ AdItem *AdGame::getItemByName(const char *name) { return _items[i]; } } - return NULL; + return nullptr; } @@ -2026,7 +2026,7 @@ bool AdGame::deleteItem(AdItem *item) { } if (_selectedItem == item) { - _selectedItem = NULL; + _selectedItem = nullptr; } _scene->handleItemAssociations(item->getName(), false); @@ -2115,7 +2115,7 @@ char *AdGame::findSpeechFile(char *stringID) { } } delete[] ret; - return NULL; + return nullptr; } @@ -2145,14 +2145,14 @@ bool AdGame::onMouseLeftDown() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("LeftClick"); } else if (_state == GAME_RUNNING && _scene && _scene->pointInViewport(_mousePos.x, _mousePos.y)) { _scene->applyEvent("LeftClick"); } } - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _gameRef->_capturedObject = _gameRef->_activeObject; } _mouseLeftDown = true; @@ -2168,12 +2168,12 @@ bool AdGame::onMouseLeftUp() { } BasePlatform::releaseCapture(); - _capturedObject = NULL; + _capturedObject = nullptr; _mouseLeftDown = false; bool handled = /*_state==GAME_RUNNING &&*/ DID_SUCCEED(applyEvent("LeftRelease")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("LeftRelease"); } else if (_state == GAME_RUNNING && _scene && _scene->pointInViewport(_mousePos.x, _mousePos.y)) { _scene->applyEvent("LeftRelease"); @@ -2198,7 +2198,7 @@ bool AdGame::onMouseLeftDblClick() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftDoubleClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("LeftDoubleClick"); } else if (_state == GAME_RUNNING && _scene && _scene->pointInViewport(_mousePos.x, _mousePos.y)) { _scene->applyEvent("LeftDoubleClick"); @@ -2229,7 +2229,7 @@ bool AdGame::onMouseRightDown() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("RightClick"); } else if (_state == GAME_RUNNING && _scene && _scene->pointInViewport(_mousePos.x, _mousePos.y)) { _scene->applyEvent("RightClick"); @@ -2246,7 +2246,7 @@ bool AdGame::onMouseRightUp() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightRelease")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("RightRelease"); } else if (_state == GAME_RUNNING && _scene && _scene->pointInViewport(_mousePos.x, _mousePos.y)) { _scene->applyEvent("RightRelease"); @@ -2272,7 +2272,7 @@ bool AdGame::displayDebugInfo() { ////////////////////////////////////////////////////////////////////////// bool AdGame::onScriptShutdown(ScScript *script) { if (_responseBox && _responseBox->_waitingScript == script) { - _responseBox->_waitingScript = NULL; + _responseBox->_waitingScript = nullptr; } return STATUS_OK; diff --git a/engines/wintermute/ad/ad_inventory.cpp b/engines/wintermute/ad/ad_inventory.cpp index 72f8fa0fb4..e9b6e56f16 100644 --- a/engines/wintermute/ad/ad_inventory.cpp +++ b/engines/wintermute/ad/ad_inventory.cpp @@ -50,12 +50,12 @@ AdInventory::~AdInventory() { ////////////////////////////////////////////////////////////////////////// bool AdInventory::insertItem(const char *name, const char *insertAfter) { - if (name == NULL) { + if (name == nullptr) { return STATUS_FAILED; } AdItem *item = ((AdGame *)_gameRef)->getItemByName(name); - if (item == NULL) { + if (item == nullptr) { return STATUS_FAILED; } @@ -84,14 +84,14 @@ bool AdInventory::insertItem(const char *name, const char *insertAfter) { ////////////////////////////////////////////////////////////////////////// bool AdInventory::removeItem(const char *name) { - if (name == NULL) { + if (name == nullptr) { return STATUS_FAILED; } for (uint32 i = 0; i < _takenItems.size(); i++) { if (scumm_stricmp(_takenItems[i]->getName(), name) == 0) { if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i]) { - ((AdGame *)_gameRef)->_selectedItem = NULL; + ((AdGame *)_gameRef)->_selectedItem = nullptr; } _takenItems.remove_at(i); return STATUS_OK; @@ -105,14 +105,14 @@ bool AdInventory::removeItem(const char *name) { ////////////////////////////////////////////////////////////////////////// bool AdInventory::removeItem(AdItem *item) { - if (item == NULL) { + if (item == nullptr) { return STATUS_FAILED; } for (uint32 i = 0; i < _takenItems.size(); i++) { if (_takenItems[i] == item) { if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i]) { - ((AdGame *)_gameRef)->_selectedItem = NULL; + ((AdGame *)_gameRef)->_selectedItem = nullptr; } _takenItems.remove_at(i); return STATUS_OK; diff --git a/engines/wintermute/ad/ad_inventory.h b/engines/wintermute/ad/ad_inventory.h index 4017d914bc..f226a65612 100644 --- a/engines/wintermute/ad/ad_inventory.h +++ b/engines/wintermute/ad/ad_inventory.h @@ -40,7 +40,7 @@ public: DECLARE_PERSISTENT(AdInventory, BaseObject) bool removeItem(const char *name); bool removeItem(AdItem *Item); - bool insertItem(const char *name, const char *insertAfter = NULL); + bool insertItem(const char *name, const char *insertAfter = nullptr); AdInventory(BaseGame *inGame); virtual ~AdInventory(); BaseArray<AdItem *> _takenItems; diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp index 7ae8ff8d69..194d975155 100644 --- a/engines/wintermute/ad/ad_inventory_box.cpp +++ b/engines/wintermute/ad/ad_inventory_box.cpp @@ -54,8 +54,8 @@ AdInventoryBox::AdInventoryBox(BaseGame *inGame) : BaseObject(inGame) { _itemWidth = _itemHeight = 50; _scrollBy = 1; - _window = NULL; - _closeButton = NULL; + _window = nullptr; + _closeButton = nullptr; _hideSelected = false; @@ -67,10 +67,10 @@ AdInventoryBox::AdInventoryBox(BaseGame *inGame) : BaseObject(inGame) { ////////////////////////////////////////////////////////////////////////// AdInventoryBox::~AdInventoryBox() { _gameRef->unregisterObject(_window); - _window = NULL; + _window = nullptr; delete _closeButton; - _closeButton = NULL; + _closeButton = nullptr; } @@ -166,7 +166,7 @@ bool AdInventoryBox::display() { ////////////////////////////////////////////////////////////////////////// bool AdInventoryBox::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdInventoryBox::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -256,7 +256,7 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) { _window = new UIWindow(_gameRef); if (!_window || DID_FAIL(_window->loadBuffer(params, false))) { delete _window; - _window = NULL; + _window = nullptr; cmd = PARSERR_GENERIC; } else { _gameRef->registerObject(_window); diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp index 427b1c7db4..8534956120 100644 --- a/engines/wintermute/ad/ad_item.cpp +++ b/engines/wintermute/ad/ad_item.cpp @@ -49,8 +49,8 @@ IMPLEMENT_PERSISTENT(AdItem, false) ////////////////////////////////////////////////////////////////////////// AdItem::AdItem(BaseGame *inGame) : AdTalkHolder(inGame) { - _spriteHover = NULL; - _cursorNormal = _cursorHover = NULL; + _spriteHover = nullptr; + _cursorNormal = _cursorHover = nullptr; _cursorCombined = true; _inInventory = false; @@ -60,7 +60,7 @@ AdItem::AdItem(BaseGame *inGame) : AdTalkHolder(inGame) { _amountOffsetX = 0; _amountOffsetY = 0; _amountAlign = TAL_RIGHT; - _amountString = NULL; + _amountString = nullptr; _state = STATE_READY; @@ -73,19 +73,19 @@ AdItem::~AdItem() { delete _spriteHover; delete _cursorNormal; delete _cursorHover; - _spriteHover = NULL; - _cursorNormal = NULL; - _cursorHover = NULL; + _spriteHover = nullptr; + _cursorNormal = nullptr; + _cursorHover = nullptr; delete[] _amountString; - _amountString = NULL; + _amountString = nullptr; } ////////////////////////////////////////////////////////////////////////// bool AdItem::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdItem::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -272,7 +272,7 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { _cursorNormal = new BaseSprite(_gameRef); if (!_cursorNormal || DID_FAIL(_cursorNormal->loadFile((char *)params, ((AdGame *)_gameRef)->_texItemLifeTime))) { delete _cursorNormal; - _cursorNormal = NULL; + _cursorNormal = nullptr; cmd = PARSERR_GENERIC; } break; @@ -282,7 +282,7 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { _cursorHover = new BaseSprite(_gameRef); if (!_cursorHover || DID_FAIL(_cursorHover->loadFile((char *)params, ((AdGame *)_gameRef)->_texItemLifeTime))) { delete _cursorHover; - _cursorHover = NULL; + _cursorHover = nullptr; cmd = PARSERR_GENERIC; } break; @@ -332,15 +332,15 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { ////////////////////////////////////////////////////////////////////////// bool AdItem::update() { - _currentSprite = NULL; + _currentSprite = nullptr; if (_state == STATE_READY && _animSprite) { delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; } // finished playing animation? - if (_state == STATE_PLAYING_ANIM && _animSprite != NULL && _animSprite->isFinished()) { + if (_state == STATE_PLAYING_ANIM && _animSprite != nullptr && _animSprite->isFinished()) { _state = STATE_READY; _currentSprite = _animSprite; } @@ -379,10 +379,10 @@ bool AdItem::update() { } bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime); - if (_tempSprite2 == NULL || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { + if (_tempSprite2 == nullptr || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { if (timeIsUp) { _sentence->finish(); - _tempSprite2 = NULL; + _tempSprite2 = nullptr; _state = STATE_READY; } else { _tempSprite2 = getTalkStance(_sentence->getNextStance()); @@ -435,7 +435,7 @@ bool AdItem::display(int x, int y) { } amountX += _amountOffsetX; - BaseFont *font = _font ? _font : _gameRef->_systemFont; + BaseFont *font = _font ? _font : _gameRef->getSystemFont(); if (font) { if (_amountString) { font->drawText((byte *)_amountString, amountX, amountY, width, _amountAlign); @@ -469,7 +469,7 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *filename = stack->pop()->getString(); delete _spriteHover; - _spriteHover = NULL; + _spriteHover = nullptr; BaseSprite *spr = new BaseSprite(_gameRef, this); if (!spr || DID_FAIL(spr->loadFile(filename))) { stack->pushBool(false); @@ -520,7 +520,7 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *filename = stack->pop()->getString(); delete _cursorNormal; - _cursorNormal = NULL; + _cursorNormal = nullptr; BaseSprite *spr = new BaseSprite(_gameRef); if (!spr || DID_FAIL(spr->loadFile(filename))) { stack->pushBool(false); @@ -569,7 +569,7 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *filename = stack->pop()->getString(); delete _cursorHover; - _cursorHover = NULL; + _cursorHover = nullptr; BaseSprite *spr = new BaseSprite(_gameRef); if (!spr || DID_FAIL(spr->loadFile(filename))) { stack->pushBool(false); @@ -753,7 +753,7 @@ bool AdItem::scSetProperty(const char *name, ScValue *value) { else if (strcmp(name, "AmountString") == 0) { if (value->isNULL()) { delete[] _amountString; - _amountString = NULL; + _amountString = nullptr; } else { BaseUtils::setString(&_amountString, value->getString()); } diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp index 209c12b7a2..7bf79e4ae5 100644 --- a/engines/wintermute/ad/ad_layer.cpp +++ b/engines/wintermute/ad/ad_layer.cpp @@ -63,7 +63,7 @@ AdLayer::~AdLayer() { ////////////////////////////////////////////////////////////////////////// bool AdLayer::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdLayer::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -174,8 +174,8 @@ bool AdLayer::loadBuffer(byte *buffer, bool complete) { cmd = PARSERR_GENERIC; delete region; delete node; - region = NULL; - node = NULL; + region = nullptr; + node = nullptr; } else { node->setRegion(region); _nodes.add(node); @@ -193,8 +193,8 @@ bool AdLayer::loadBuffer(byte *buffer, bool complete) { cmd = PARSERR_GENERIC; delete entity; delete node; - entity = NULL; - node = NULL; + entity = nullptr; + node = nullptr; } else { node->setEntity(entity); _nodes.add(node); @@ -339,7 +339,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1); ScValue *val = stack->pop(); - AdSceneNode *toDelete = NULL; + AdSceneNode *toDelete = nullptr; if (val->isNative()) { BaseScriptable *temp = val->getNative(); for (uint32 i = 0; i < _nodes.size(); i++) { @@ -354,7 +354,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, toDelete = _nodes[index]; } } - if (toDelete == NULL) { + if (toDelete == nullptr) { stack->pushBool(false); return STATUS_OK; } @@ -362,7 +362,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, for (uint32 i = 0; i < _nodes.size(); i++) { if (_nodes[i] == toDelete) { delete _nodes[i]; - _nodes[i] = NULL; + _nodes[i] = nullptr; _nodes.remove_at(i); break; } diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp index 493156c750..34e220569f 100644 --- a/engines/wintermute/ad/ad_node_state.cpp +++ b/engines/wintermute/ad/ad_node_state.cpp @@ -42,14 +42,14 @@ IMPLEMENT_PERSISTENT(AdNodeState, false) ////////////////////////////////////////////////////////////////////////// AdNodeState::AdNodeState(BaseGame *inGame) : BaseClass(inGame) { - _name = NULL; + _name = nullptr; _active = false; for (int i = 0; i < 7; i++) { - _caption[i] = NULL; + _caption[i] = nullptr; } _alphaColor = 0; - _filename = NULL; - _cursor = NULL; + _filename = nullptr; + _cursor = nullptr; } @@ -58,12 +58,12 @@ AdNodeState::~AdNodeState() { delete[] _name; delete[] _filename; delete[] _cursor; - _name = NULL; - _filename = NULL; - _cursor = NULL; + _name = nullptr; + _filename = nullptr; + _cursor = nullptr; for (int i = 0; i < 7; i++) { delete[] _caption[i]; - _caption[i] = NULL; + _caption[i] = nullptr; } } @@ -71,7 +71,7 @@ AdNodeState::~AdNodeState() { ////////////////////////////////////////////////////////////////////////// void AdNodeState::setName(const char *name) { delete[] _name; - _name = NULL; + _name = nullptr; BaseUtils::setString(&_name, name); } @@ -79,7 +79,7 @@ void AdNodeState::setName(const char *name) { ////////////////////////////////////////////////////////////////////////// void AdNodeState::setFilename(const char *filename) { delete[] _filename; - _filename = NULL; + _filename = nullptr; BaseUtils::setString(&_filename, filename); } @@ -87,7 +87,7 @@ void AdNodeState::setFilename(const char *filename) { ////////////////////////////////////////////////////////////////////////// void AdNodeState::setCursor(const char *filename) { delete[] _cursor; - _cursor = NULL; + _cursor = nullptr; BaseUtils::setString(&_cursor, filename); } @@ -132,7 +132,7 @@ const char *AdNodeState::getCaption(int caseVal) { if (caseVal == 0) { caseVal = 1; } - if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == NULL) { + if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == nullptr) { return ""; } else { return _caption[caseVal - 1]; diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp index a940b33805..a41ed9fbc3 100644 --- a/engines/wintermute/ad/ad_object.cpp +++ b/engines/wintermute/ad/ad_object.cpp @@ -65,27 +65,27 @@ AdObject::AdObject(BaseGame *inGame) : BaseObject(inGame) { _active = true; _drawn = false; - _currentSprite = NULL; - _animSprite = NULL; - _tempSprite2 = NULL; + _currentSprite = nullptr; + _animSprite = nullptr; + _tempSprite2 = nullptr; - _font = NULL; + _font = nullptr; - _sentence = NULL; + _sentence = nullptr; - _forcedTalkAnimName = NULL; + _forcedTalkAnimName = nullptr; _forcedTalkAnimUsed = false; - _blockRegion = NULL; - _wptGroup = NULL; + _blockRegion = nullptr; + _wptGroup = nullptr; - _currentBlockRegion = NULL; - _currentWptGroup = NULL; + _currentBlockRegion = nullptr; + _currentWptGroup = nullptr; _ignoreItems = false; _sceneIndependent = false; - _stickRegion = NULL; + _stickRegion = nullptr; _subtitlesModRelative = true; _subtitlesModX = 0; @@ -93,13 +93,13 @@ AdObject::AdObject(BaseGame *inGame) : BaseObject(inGame) { _subtitlesWidth = 0; _subtitlesModXCenter = true; - _inventory = NULL; + _inventory = nullptr; for (int i = 0; i < MAX_NUM_REGIONS; i++) { - _currentRegions[i] = NULL; + _currentRegions[i] = nullptr; } - _partEmitter = NULL; + _partEmitter = nullptr; _partFollowParent = false; _partOffsetX = _partOffsetY = 0; @@ -109,26 +109,26 @@ AdObject::AdObject(BaseGame *inGame) : BaseObject(inGame) { ////////////////////////////////////////////////////////////////////////// AdObject::~AdObject() { - _currentSprite = NULL; // reference only, don't delete + _currentSprite = nullptr; // reference only, don't delete delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; delete _sentence; - _sentence = NULL; + _sentence = nullptr; delete[] _forcedTalkAnimName; - _forcedTalkAnimName = NULL; + _forcedTalkAnimName = nullptr; delete _blockRegion; - _blockRegion = NULL; + _blockRegion = nullptr; delete _wptGroup; - _wptGroup = NULL; + _wptGroup = nullptr; delete _currentBlockRegion; - _currentBlockRegion = NULL; + _currentBlockRegion = nullptr; delete _currentWptGroup; - _currentWptGroup = NULL; + _currentWptGroup = nullptr; - _tempSprite2 = NULL; // reference only - _stickRegion = NULL; + _tempSprite2 = nullptr; // reference only + _stickRegion = nullptr; if (_font) { _gameRef->_fontStorage->removeFont(_font); @@ -136,7 +136,7 @@ AdObject::~AdObject() { if (_inventory) { ((AdGame *)_gameRef)->unregisterInventory(_inventory); - _inventory = NULL; + _inventory = nullptr; } if (_partEmitter) { @@ -159,7 +159,7 @@ AdObject::~AdObject() { ////////////////////////////////////////////////////////////////////////// bool AdObject::playAnim(const char *filename) { delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; _animSprite = new BaseSprite(_gameRef, this); if (!_animSprite) { _gameRef->LOG(0, "AdObject::PlayAnim: error creating temp sprite (object:\"%s\" sprite:\"%s\")", getName(), filename); @@ -169,7 +169,7 @@ bool AdObject::playAnim(const char *filename) { if (DID_FAIL(res)) { _gameRef->LOG(res, "AdObject::PlayAnim: error loading temp sprite (object:\"%s\" sprite:\"%s\")", getName(), filename); delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; return res; } _state = STATE_PLAYING_ANIM; @@ -274,7 +274,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack int duration = stack->pop()->getInt(); ScValue *valStances = stack->pop(); - const char *stances = valStances->isNULL() ? NULL : valStances->getString(); + const char *stances = valStances->isNULL() ? nullptr : valStances->getString(); int align = 0; ScValue *val = stack->pop(); @@ -286,7 +286,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack align = MIN(MAX(0, align), NUM_TEXT_ALIGN - 1); - const char *sound = soundVal->isNULL() ? NULL : soundVal->getString(); + const char *sound = soundVal->isNULL() ? nullptr : soundVal->getString(); talk(text, sound, duration, stances, (TTextAlign)align); if (strcmp(name, "TalkAsync") != 0) { @@ -309,7 +309,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack uint32 i; ScValue *val = stack->pop(); if (val->isNULL() || !main) { - _stickRegion = NULL; + _stickRegion = nullptr; regFound = true; } else if (val->isString()) { const char *regionName = val->getString(); @@ -334,7 +334,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack } if (!regFound) { - _stickRegion = NULL; + _stickRegion = nullptr; } stack->pushBool(regFound); return STATUS_OK; @@ -348,7 +348,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack ScValue *val = stack->pop(); if (val->isNULL()) { - setFont(NULL); + setFont(nullptr); } else { setFont(val->getString()); } @@ -385,7 +385,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack if (!val->isNULL()) { const char *itemName = val->getString(); val = stack->pop(); - const char *insertAfter = val->isNULL() ? NULL : val->getString(); + const char *insertAfter = val->isNULL() ? nullptr : val->getString(); if (DID_FAIL(_inventory->insertItem(itemName, insertAfter))) { script->runtimeError("Cannot add item '%s' to inventory", itemName); } else { @@ -512,7 +512,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack stack->correctParams(0); if (_partEmitter) { _gameRef->unregisterObject(_partEmitter); - _partEmitter = NULL; + _partEmitter = nullptr; } stack->pushNULL(); @@ -533,7 +533,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack AdEntity *ent = new AdEntity(_gameRef); if (DID_FAIL(res = ent->loadFile(filename))) { delete ent; - ent = NULL; + ent = nullptr; script->runtimeError("AddAttachment() failed loading entity '%s'", filename); stack->pushBool(false); } else { @@ -611,7 +611,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack stack->correctParams(1); ScValue *val = stack->pop(); - AdObject *ret = NULL; + AdObject *ret = nullptr; if (val->isInt()) { int index = val->getInt(); int currIndex = 0; @@ -645,7 +645,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack } } - if (ret != NULL) { + if (ret != nullptr) { stack->pushNative(ret, true); } else { stack->pushNULL(); @@ -851,9 +851,9 @@ bool AdObject::setFont(const char *filename) { } if (filename) { _font = _gameRef->_fontStorage->addFont(filename); - return _font == NULL ? STATUS_FAILED : STATUS_OK; + return _font == nullptr ? STATUS_FAILED : STATUS_OK; } else { - _font = NULL; + _font = nullptr; return STATUS_OK; } } @@ -893,12 +893,12 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const if (_forcedTalkAnimName && _forcedTalkAnimUsed) { delete[] _forcedTalkAnimName; - _forcedTalkAnimName = NULL; + _forcedTalkAnimName = nullptr; _forcedTalkAnimUsed = false; } delete(_sentence->_sound); - _sentence->_sound = NULL; + _sentence->_sound = nullptr; _sentence->setText(text); _gameRef->_stringTable->expand(&_sentence->_text); @@ -907,7 +907,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const _sentence->_align = Align; _sentence->_startTime = _gameRef->_timer; _sentence->_currentStance = -1; - _sentence->_font = _font == NULL ? _gameRef->_systemFont : _font; + _sentence->_font = _font == nullptr ? _gameRef->getSystemFont() : _font; _sentence->_freezable = _freezable; // try to locate speech file automatically @@ -1012,9 +1012,9 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const ////////////////////////////////////////////////////////////////////////// bool AdObject::reset() { - if (_state == STATE_PLAYING_ANIM && _animSprite != NULL) { + if (_state == STATE_PLAYING_ANIM && _animSprite != nullptr) { delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; } else if (_state == STATE_TALKING && _sentence) { _sentence->finish(); } @@ -1157,7 +1157,7 @@ bool AdObject::afterMove() { bool regFound = false; for (int j = 0; j < MAX_NUM_REGIONS; j++) { if (_currentRegions[j] == newRegions[i]) { - _currentRegions[j] = NULL; + _currentRegions[j] = nullptr; regFound = true; break; } @@ -1180,7 +1180,7 @@ bool AdObject::afterMove() { ////////////////////////////////////////////////////////////////////////// bool AdObject::invalidateCurrRegions() { for (int i = 0; i < MAX_NUM_REGIONS; i++) { - _currentRegions[i] = NULL; + _currentRegions[i] = nullptr; } return STATUS_OK; } diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h index 2a437c7e09..39480e3446 100644 --- a/engines/wintermute/ad/ad_object.h +++ b/engines/wintermute/ad/ad_object.h @@ -60,7 +60,7 @@ public: virtual bool updateSounds(); bool reset(); DECLARE_PERSISTENT(AdObject, BaseObject) - virtual void talk(const char *text, const char *sound = NULL, uint32 duration = 0, const char *stances = NULL, TTextAlign align = TAL_CENTER); + virtual void talk(const char *text, const char *sound = nullptr, uint32 duration = 0, const char *stances = nullptr, TTextAlign align = TAL_CENTER); virtual int getHeight(); bool setFont(const char *filename); diff --git a/engines/wintermute/ad/ad_path.cpp b/engines/wintermute/ad/ad_path.cpp index c931213456..afdd29828c 100644 --- a/engines/wintermute/ad/ad_path.cpp +++ b/engines/wintermute/ad/ad_path.cpp @@ -64,7 +64,7 @@ BasePoint *AdPath::getFirst() { _currIndex = 0; return _points[_currIndex]; } else { - return NULL; + return nullptr; } } @@ -75,7 +75,7 @@ BasePoint *AdPath::getNext() { if (_currIndex < (int32)_points.size()) { return _points[_currIndex]; } else { - return NULL; + return nullptr; } } @@ -85,7 +85,7 @@ BasePoint *AdPath::getCurrent() { if (_currIndex >= 0 && _currIndex < (int32)_points.size()) { return _points[_currIndex]; } else { - return NULL; + return nullptr; } } diff --git a/engines/wintermute/ad/ad_path_point.cpp b/engines/wintermute/ad/ad_path_point.cpp index a36648eb69..f3ccd264b1 100644 --- a/engines/wintermute/ad/ad_path_point.cpp +++ b/engines/wintermute/ad/ad_path_point.cpp @@ -39,7 +39,7 @@ AdPathPoint::AdPathPoint() { _distance = 0; _marked = false; - _origin = NULL; + _origin = nullptr; } @@ -50,13 +50,13 @@ AdPathPoint::AdPathPoint(int initX, int initY, int initDistance) { _distance = initDistance; _marked = false; - _origin = NULL; + _origin = nullptr; } ////////////////////////////////////////////////////////////////////////// AdPathPoint::~AdPathPoint() { - _origin = NULL; + _origin = nullptr; } diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp index daf0c89606..acd5f13397 100644 --- a/engines/wintermute/ad/ad_region.cpp +++ b/engines/wintermute/ad/ad_region.cpp @@ -70,7 +70,7 @@ bool AdRegion::hasDecoration() const { ////////////////////////////////////////////////////////////////////////// bool AdRegion::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdRegion::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } diff --git a/engines/wintermute/ad/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp index a2225f2632..e4993b9ad4 100644 --- a/engines/wintermute/ad/ad_response.cpp +++ b/engines/wintermute/ad/ad_response.cpp @@ -38,10 +38,10 @@ IMPLEMENT_PERSISTENT(AdResponse, false) ////////////////////////////////////////////////////////////////////////// AdResponse::AdResponse(BaseGame *inGame) : BaseObject(inGame) { - _text = NULL; - _textOrig = NULL; - _icon = _iconHover = _iconPressed = NULL; - _font = NULL; + _text = nullptr; + _textOrig = nullptr; + _icon = _iconHover = _iconPressed = nullptr; + _font = nullptr; _iD = 0; _responseType = RESPONSE_ALWAYS; } @@ -54,11 +54,11 @@ AdResponse::~AdResponse() { delete _icon; delete _iconHover; delete _iconPressed; - _text = NULL; - _textOrig = NULL; - _icon = NULL; - _iconHover = NULL; - _iconPressed = NULL; + _text = nullptr; + _textOrig = nullptr; + _icon = nullptr; + _iconHover = nullptr; + _iconPressed = nullptr; if (_font) { _gameRef->_fontStorage->removeFont(_font); } @@ -79,7 +79,7 @@ bool AdResponse::setIcon(const char *filename) { if (!_icon || DID_FAIL(_icon->loadFile(filename))) { _gameRef->LOG(0, "AdResponse::setIcon failed for file '%s'", filename); delete _icon; - _icon = NULL; + _icon = nullptr; return STATUS_FAILED; } return STATUS_OK; @@ -105,7 +105,7 @@ bool AdResponse::setIconHover(const char *filename) { if (!_iconHover || DID_FAIL(_iconHover->loadFile(filename))) { _gameRef->LOG(0, "AdResponse::setIconHover failed for file '%s'", filename); delete _iconHover; - _iconHover = NULL; + _iconHover = nullptr; return STATUS_FAILED; } return STATUS_OK; @@ -119,7 +119,7 @@ bool AdResponse::setIconPressed(const char *filename) { if (!_iconPressed || DID_FAIL(_iconPressed->loadFile(filename))) { _gameRef->LOG(0, "AdResponse::setIconPressed failed for file '%s'", filename); delete _iconPressed; - _iconPressed = NULL; + _iconPressed = nullptr; return STATUS_FAILED; } return STATUS_OK; diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp index 45fd33d222..c891d2a019 100644 --- a/engines/wintermute/ad/ad_response_box.cpp +++ b/engines/wintermute/ad/ad_response_box.cpp @@ -52,9 +52,9 @@ IMPLEMENT_PERSISTENT(AdResponseBox, false) ////////////////////////////////////////////////////////////////////////// AdResponseBox::AdResponseBox(BaseGame *inGame) : BaseObject(inGame) { - _font = _fontHover = NULL; + _font = _fontHover = nullptr; - _window = NULL; + _window = nullptr; _shieldWindow = new UIWindow(_gameRef); _horizontal = false; @@ -62,9 +62,9 @@ AdResponseBox::AdResponseBox(BaseGame *inGame) : BaseObject(inGame) { _scrollOffset = 0; _spacing = 0; - _waitingScript = NULL; - _lastResponseText = NULL; - _lastResponseTextOrig = NULL; + _waitingScript = nullptr; + _lastResponseText = nullptr; + _lastResponseTextOrig = nullptr; _verticalAlign = VAL_BOTTOM; _align = TAL_LEFT; @@ -75,13 +75,13 @@ AdResponseBox::AdResponseBox(BaseGame *inGame) : BaseObject(inGame) { AdResponseBox::~AdResponseBox() { delete _window; - _window = NULL; + _window = nullptr; delete _shieldWindow; - _shieldWindow = NULL; + _shieldWindow = nullptr; delete[] _lastResponseText; - _lastResponseText = NULL; + _lastResponseText = nullptr; delete[] _lastResponseTextOrig; - _lastResponseTextOrig = NULL; + _lastResponseTextOrig = nullptr; if (_font) { _gameRef->_fontStorage->removeFont(_font); @@ -93,7 +93,7 @@ AdResponseBox::~AdResponseBox() { clearResponses(); clearButtons(); - _waitingScript = NULL; + _waitingScript = nullptr; } uint32 AdResponseBox::getNumResponses() const { @@ -121,11 +121,11 @@ void AdResponseBox::clearButtons() { ////////////////////////////////////////////////////////////////////////// bool AdResponseBox::invalidateButtons() { for (uint32 i = 0; i < _respButtons.size(); i++) { - _respButtons[i]->_image = NULL; - _respButtons[i]->_cursor = NULL; - _respButtons[i]->_font = NULL; - _respButtons[i]->_fontHover = NULL; - _respButtons[i]->_fontPress = NULL; + _respButtons[i]->_image = nullptr; + _respButtons[i]->_cursor = nullptr; + _respButtons[i]->_font = nullptr; + _respButtons[i]->_fontHover = nullptr; + _respButtons[i]->_fontPress = nullptr; _respButtons[i]->setText(""); } return STATUS_OK; @@ -163,8 +163,8 @@ bool AdResponseBox::createButtons() { // textual else { btn->setText(_responses[i]->_text); - btn->_font = (_font == NULL) ? _gameRef->_systemFont : _font; - btn->_fontHover = (_fontHover == NULL) ? _gameRef->_systemFont : _fontHover; + btn->_font = (_font == nullptr) ? _gameRef->getSystemFont() : _font; + btn->_fontHover = (_fontHover == nullptr) ? _gameRef->getSystemFont() : _fontHover; btn->_fontPress = btn->_fontHover; btn->_align = _align; @@ -210,7 +210,7 @@ bool AdResponseBox::createButtons() { ////////////////////////////////////////////////////////////////////////// bool AdResponseBox::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdResponseBox::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -287,7 +287,7 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) { _window = new UIWindow(_gameRef); if (!_window || DID_FAIL(_window->loadBuffer(params, false))) { delete _window; - _window = NULL; + _window = nullptr; cmd = PARSERR_GENERIC; } else if (_shieldWindow) { _shieldWindow->_parent = _window; @@ -355,7 +355,7 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -551,7 +551,7 @@ bool AdResponseBox::listen(BaseScriptHolder *param1, uint32 param2) { _waitingScript->_stack->pushInt(_responses[param2]->_iD); } handleResponse(_responses[param2]); - _waitingScript = NULL; + _waitingScript = nullptr; _gameRef->_state = GAME_RUNNING; ((AdGame *)_gameRef)->_stateEx = GAME_NORMAL; _ready = true; @@ -683,9 +683,9 @@ BaseObject *AdResponseBox::getNextAccessObject(BaseObject *currObject) { getObjects(objects, true); if (objects.size() == 0) { - return NULL; + return nullptr; } else { - if (currObject != NULL) { + if (currObject != nullptr) { for (uint32 i = 0; i < objects.size(); i++) { if (objects[i] == currObject) { if (i < objects.size() - 1) { @@ -698,7 +698,7 @@ BaseObject *AdResponseBox::getNextAccessObject(BaseObject *currObject) { } return objects[0]; } - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -707,9 +707,9 @@ BaseObject *AdResponseBox::getPrevAccessObject(BaseObject *currObject) { getObjects(objects, true); if (objects.size() == 0) { - return NULL; + return nullptr; } else { - if (currObject != NULL) { + if (currObject != nullptr) { for (int i = objects.size() - 1; i >= 0; i--) { if (objects[i] == currObject) { if (i > 0) { @@ -722,7 +722,7 @@ BaseObject *AdResponseBox::getPrevAccessObject(BaseObject *currObject) { } return objects[objects.size() - 1]; } - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/wintermute/ad/ad_response_context.cpp b/engines/wintermute/ad/ad_response_context.cpp index ebfa03feea..d87651c178 100644 --- a/engines/wintermute/ad/ad_response_context.cpp +++ b/engines/wintermute/ad/ad_response_context.cpp @@ -36,14 +36,14 @@ IMPLEMENT_PERSISTENT(AdResponseContext, false) ////////////////////////////////////////////////////////////////////////// AdResponseContext::AdResponseContext(BaseGame *inGame) : BaseClass(inGame) { _id = 0; - _context = NULL; + _context = nullptr; } ////////////////////////////////////////////////////////////////////////// AdResponseContext::~AdResponseContext() { delete[] _context; - _context = NULL; + _context = nullptr; } @@ -59,7 +59,7 @@ bool AdResponseContext::persist(BasePersistenceManager *persistMgr) { ////////////////////////////////////////////////////////////////////////// void AdResponseContext::setContext(const char *context) { delete[] _context; - _context = NULL; + _context = nullptr; if (context) { _context = new char [strlen(context) + 1]; if (_context) { diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp index fb9a4a47b9..4d7f27aec7 100644 --- a/engines/wintermute/ad/ad_rot_level.cpp +++ b/engines/wintermute/ad/ad_rot_level.cpp @@ -54,7 +54,7 @@ AdRotLevel::~AdRotLevel() { ////////////////////////////////////////////////////////////////////////// bool AdRotLevel::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdRotLevel::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp index cfec8d7cb9..e80f38bd0f 100644 --- a/engines/wintermute/ad/ad_scale_level.cpp +++ b/engines/wintermute/ad/ad_scale_level.cpp @@ -55,7 +55,7 @@ float AdScaleLevel::getScale() const { ////////////////////////////////////////////////////////////////////////// bool AdScaleLevel::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdScaleLevel::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp index 526e0802cb..f305c2f60e 100644 --- a/engines/wintermute/ad/ad_scene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -77,7 +77,7 @@ AdScene::~AdScene() { cleanup(); _gameRef->unregisterObject(_fader); delete _pfTarget; - _pfTarget = NULL; + _pfTarget = nullptr; } @@ -85,9 +85,9 @@ AdScene::~AdScene() { void AdScene::setDefaults() { _initialized = false; _pfReady = true; - _pfTargetPath = NULL; - _pfRequester = NULL; - _mainLayer = NULL; + _pfTargetPath = nullptr; + _pfRequester = nullptr; + _mainLayer = nullptr; _pfPointsNum = 0; _persistentState = false; @@ -127,12 +127,12 @@ void AdScene::setDefaults() { _editorShowEntities = true; _editorShowScale = true; - _shieldWindow = NULL; + _shieldWindow = nullptr; _fader = new BaseFader(_gameRef); _gameRef->registerObject(_fader); - _viewport = NULL; + _viewport = nullptr; } @@ -140,13 +140,13 @@ void AdScene::setDefaults() { void AdScene::cleanup() { BaseObject::cleanup(); - _mainLayer = NULL; // reference only + _mainLayer = nullptr; // reference only delete _shieldWindow; - _shieldWindow = NULL; + _shieldWindow = nullptr; _gameRef->unregisterObject(_fader); - _fader = NULL; + _fader = nullptr; for (uint32 i = 0; i < _layers.size(); i++) { _gameRef->unregisterObject(_layers[i]); @@ -182,7 +182,7 @@ void AdScene::cleanup() { _objects.clear(); delete _viewport; - _viewport = NULL; + _viewport = nullptr; setDefaults(); } @@ -473,7 +473,7 @@ void AdScene::pathFinderStep() { int i; // get lowest unmarked int lowestDist = INT_MAX; - AdPathPoint *lowestPt = NULL; + AdPathPoint *lowestPt = nullptr; for (i = 0; i < _pfPointsNum; i++) if (!_pfPath[i]->_marked && _pfPath[i]->_distance < lowestDist) { @@ -481,7 +481,7 @@ void AdScene::pathFinderStep() { lowestPt = _pfPath[i]; } - if (lowestPt == NULL) { // no path -> terminate PathFinder + if (lowestPt == nullptr) { // no path -> terminate PathFinder _pfReady = true; _pfTargetPath->setReady(true); return; @@ -491,7 +491,7 @@ void AdScene::pathFinderStep() { // target point marked, generate path and terminate if (lowestPt->x == _pfTarget->x && lowestPt->y == _pfTarget->y) { - while (lowestPt != NULL) { + while (lowestPt != nullptr) { _pfTargetPath->_points.insert_at(0, new BasePoint(lowestPt->x, lowestPt->y)); lowestPt = lowestPt->_origin; } @@ -539,7 +539,7 @@ bool AdScene::initLoop() { ////////////////////////////////////////////////////////////////////////// bool AdScene::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdScene::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -680,7 +680,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { if (!layer || DID_FAIL(layer->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; delete layer; - layer = NULL; + layer = nullptr; } else { _gameRef->registerObject(layer); _layers.add(layer); @@ -698,7 +698,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { if (!wpt || DID_FAIL(wpt->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; delete wpt; - wpt = NULL; + wpt = nullptr; } else { _gameRef->registerObject(wpt); _waypointGroups.add(wpt); @@ -711,7 +711,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { if (!sl || DID_FAIL(sl->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; delete sl; - sl = NULL; + sl = nullptr; } else { _gameRef->registerObject(sl); _scaleLevels.add(sl); @@ -724,7 +724,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { if (!rl || DID_FAIL(rl->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; delete rl; - rl = NULL; + rl = nullptr; } else { _gameRef->registerObject(rl); _rotLevels.add(rl); @@ -737,7 +737,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { if (!entity || DID_FAIL(entity->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; delete entity; - entity = NULL; + entity = nullptr; } else { addObject(entity); } @@ -749,7 +749,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -884,7 +884,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { return STATUS_FAILED; } - if (_mainLayer == NULL) { + if (_mainLayer == nullptr) { _gameRef->LOG(0, "Warning: scene '%s' has no main layer.", getFilename()); } @@ -923,7 +923,7 @@ bool AdScene::traverseNodes(bool doUpdate) { // *** adjust scroll offset if (doUpdate) { /* - if (_autoScroll && _gameRef->_mainObject != NULL) + if (_autoScroll && _gameRef->_mainObject != nullptr) { ScrollToObject(_gameRef->_mainObject); } @@ -1078,7 +1078,7 @@ bool AdScene::traverseNodes(bool doUpdate) { if (doUpdate) { updateFreeObjects(); } else { - displayRegionContent(NULL); + displayRegionContent(nullptr); } } } // each layer @@ -1138,8 +1138,8 @@ bool AdScene::updateFreeObjects() { } - if (_autoScroll && _gameRef->_mainObject != NULL) { - scrollToObject(_gameRef->_mainObject); + if (_autoScroll && _gameRef->getMainObject() != nullptr) { + scrollToObject(_gameRef->getMainObject()); } @@ -1156,7 +1156,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) { // global objects for (uint32 i = 0; i < adGame->_objects.size(); i++) { obj = adGame->_objects[i]; - if (obj->_active && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) { + if (obj->_active && !obj->_drawn && (obj->_stickRegion == region || region == nullptr || (obj->_stickRegion == nullptr && region->pointInRegion(obj->_posX, obj->_posY)))) { objects.push_back(obj); } } @@ -1164,7 +1164,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) { // scene objects for (uint32 i = 0; i < _objects.size(); i++) { obj = _objects[i]; - if (obj->_active && !obj->_editorOnly && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) { + if (obj->_active && !obj->_editorOnly && !obj->_drawn && (obj->_stickRegion == region || region == nullptr || (obj->_stickRegion == nullptr && region->pointInRegion(obj->_posX, obj->_posY)))) { objects.push_back(obj); } } @@ -1191,7 +1191,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) { // display design only objects if (!display3DOnly) { - if (_gameRef->_editorMode && region == NULL) { + if (_gameRef->_editorMode && region == nullptr) { for (uint32 i = 0; i < _objects.size(); i++) { if (_objects[i]->_active && _objects[i]->_editorOnly) { _objects[i]->display(); @@ -1220,12 +1220,12 @@ bool AdScene::displayRegionContentOld(AdRegion *region) { // display all objects in region sorted by _posY do { - obj = NULL; + obj = nullptr; int minY = INT_MAX; // global objects for (uint32 i = 0; i < adGame->_objects.size(); i++) { - if (adGame->_objects[i]->_active && !adGame->_objects[i]->_drawn && adGame->_objects[i]->_posY < minY && (adGame->_objects[i]->_stickRegion == region || region == NULL || (adGame->_objects[i]->_stickRegion == NULL && region->pointInRegion(adGame->_objects[i]->_posX, adGame->_objects[i]->_posY)))) { + if (adGame->_objects[i]->_active && !adGame->_objects[i]->_drawn && adGame->_objects[i]->_posY < minY && (adGame->_objects[i]->_stickRegion == region || region == nullptr || (adGame->_objects[i]->_stickRegion == nullptr && region->pointInRegion(adGame->_objects[i]->_posX, adGame->_objects[i]->_posY)))) { obj = adGame->_objects[i]; minY = adGame->_objects[i]->_posY; } @@ -1233,14 +1233,14 @@ bool AdScene::displayRegionContentOld(AdRegion *region) { // scene objects for (uint32 i = 0; i < _objects.size(); i++) { - if (_objects[i]->_active && !_objects[i]->_editorOnly && !_objects[i]->_drawn && _objects[i]->_posY < minY && (_objects[i]->_stickRegion == region || region == NULL || (_objects[i]->_stickRegion == NULL && region->pointInRegion(_objects[i]->_posX, _objects[i]->_posY)))) { + if (_objects[i]->_active && !_objects[i]->_editorOnly && !_objects[i]->_drawn && _objects[i]->_posY < minY && (_objects[i]->_stickRegion == region || region == nullptr || (_objects[i]->_stickRegion == nullptr && region->pointInRegion(_objects[i]->_posX, _objects[i]->_posY)))) { obj = _objects[i]; minY = _objects[i]->_posY; } } - if (obj != NULL) { + if (obj != nullptr) { _gameRef->_renderer->setup2D(); if (_gameRef->_editorMode || !obj->_editorOnly) { @@ -1248,11 +1248,11 @@ bool AdScene::displayRegionContentOld(AdRegion *region) { } obj->_drawn = true; } - } while (obj != NULL); + } while (obj != nullptr); // design only objects - if (_gameRef->_editorMode && region == NULL) { + if (_gameRef->_editorMode && region == nullptr) { for (uint32 i = 0; i < _objects.size(); i++) { if (_objects[i]->_active && _objects[i]->_editorOnly) { _objects[i]->display(); @@ -1285,7 +1285,7 @@ void AdScene::scrollTo(int offsetX, int offsetY) { _targetOffsetTop = MIN(_targetOffsetTop, _height - viewportHeight); - if (_gameRef->_mainObject && _gameRef->_mainObject->_is3D) { + if (_gameRef->getMainObject() && _gameRef->getMainObject()->_is3D) { if (abs(origOffsetLeft - _targetOffsetLeft) < 5) { _targetOffsetLeft = origOffsetLeft; } @@ -1346,7 +1346,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->pushNative(act, true); } else { delete act; - act = NULL; + act = nullptr; stack->pushNULL(); } return STATUS_OK; @@ -1363,7 +1363,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->pushNative(ent, true); } else { delete ent; - ent = NULL; + ent = nullptr; stack->pushNULL(); } return STATUS_OK; @@ -1504,7 +1504,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1); ScValue *val = stack->pop(); - AdObject *ret = NULL; + AdObject *ret = nullptr; if (val->isInt()) { int index = val->getInt(); if (index >= 0 && index < (int32)_objects.size()) { @@ -1772,7 +1772,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1); ScValue *val = stack->pop(); - AdLayer *toDelete = NULL; + AdLayer *toDelete = nullptr; if (val->isNative()) { BaseScriptable *temp = val->getNative(); for (uint32 i = 0; i < _layers.size(); i++) { @@ -1787,7 +1787,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, toDelete = _layers[index]; } } - if (toDelete == NULL) { + if (toDelete == nullptr) { stack->pushBool(false); return STATUS_OK; } @@ -1878,7 +1878,7 @@ ScValue *AdScene::scGetProperty(const Common::String &name) { ////////////////////////////////////////////////////////////////////////// else if (name == "MouseY") { int viewportY; - getViewportOffset(NULL, &viewportY); + getViewportOffset(nullptr, &viewportY); _scValue->setInt(_gameRef->_mousePos.y + _offsetTop - viewportY); return _scValue; @@ -2268,8 +2268,8 @@ bool AdScene::sortRotLevels() { ////////////////////////////////////////////////////////////////////////// float AdScene::getScaleAt(int Y) { - AdScaleLevel *prev = NULL; - AdScaleLevel *next = NULL; + AdScaleLevel *prev = nullptr; + AdScaleLevel *next = nullptr; for (uint32 i = 0; i < _scaleLevels.size(); i++) { /* AdScaleLevel *xxx = _scaleLevels[i];*/ @@ -2282,7 +2282,7 @@ float AdScene::getScaleAt(int Y) { } } - if (prev == NULL || next == NULL) { + if (prev == nullptr || next == nullptr) { return 100; } @@ -2514,7 +2514,7 @@ void AdScene::pfPointsAdd(int x, int y, int distance) { _pfPath[_pfPointsNum]->y = y; _pfPath[_pfPointsNum]->_distance = distance; _pfPath[_pfPointsNum]->_marked = false; - _pfPath[_pfPointsNum]->_origin = NULL; + _pfPath[_pfPointsNum]->_origin = nullptr; } _pfPointsNum++; @@ -2591,7 +2591,7 @@ int AdScene::getOffsetLeft() { ////////////////////////////////////////////////////////////////////////// int AdScene::getOffsetTop() { int viewportY; - getViewportOffset(NULL, &viewportY); + getViewportOffset(nullptr, &viewportY); return _offsetTop - viewportY; } @@ -2617,7 +2617,7 @@ void AdScene::setOffset(int offsetLeft, int offsetTop) { ////////////////////////////////////////////////////////////////////////// BaseObject *AdScene::getNodeByName(const char *name) { - BaseObject *ret = NULL; + BaseObject *ret = nullptr; // dependent objects for (uint32 i = 0; i < _layers.size(); i++) { @@ -2634,7 +2634,7 @@ BaseObject *AdScene::getNodeByName(const char *name) { ret = node->_region; break; default: - ret = NULL; + ret = nullptr; } return ret; } @@ -2655,7 +2655,7 @@ BaseObject *AdScene::getNodeByName(const char *name) { } } - return NULL; + return nullptr; } @@ -2755,8 +2755,8 @@ bool AdScene::persistState(bool saving) { ////////////////////////////////////////////////////////////////////////// float AdScene::getRotationAt(int x, int y) { - AdRotLevel *prev = NULL; - AdRotLevel *next = NULL; + AdRotLevel *prev = nullptr; + AdRotLevel *next = nullptr; for (uint32 i = 0; i < _rotLevels.size(); i++) { /* AdRotLevel *xxx = _rotLevels[i]; @@ -2769,7 +2769,7 @@ float AdScene::getRotationAt(int x, int y) { } } - if (prev == NULL || next == NULL) { + if (prev == nullptr || next == nullptr) { return 0; } @@ -2827,7 +2827,7 @@ bool AdScene::getRegionsAt(int x, int y, AdRegion **regionList, int numRegions) } } for (int i = numUsed; i < numRegions; i++) { - regionList[i] = NULL; + regionList[i] = nullptr; } return STATUS_OK; @@ -2845,9 +2845,9 @@ BaseObject *AdScene::getNextAccessObject(BaseObject *currObject) { getSceneObjects(objects, true); if (objects.size() == 0) { - return NULL; + return nullptr; } else { - if (currObject != NULL) { + if (currObject != nullptr) { for (uint32 i = 0; i < objects.size(); i++) { if (objects[i] == currObject) { if (i < objects.size() - 1) { @@ -2860,7 +2860,7 @@ BaseObject *AdScene::getNextAccessObject(BaseObject *currObject) { } return objects[0]; } - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -2869,9 +2869,9 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) { getSceneObjects(objects, true); if (objects.size() == 0) { - return NULL; + return nullptr; } else { - if (currObject != NULL) { + if (currObject != nullptr) { for (int i = objects.size() - 1; i >= 0; i--) { if (objects[i] == currObject) { if (i > 0) { @@ -2884,7 +2884,7 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) { } return objects[objects.size() - 1]; } - return NULL; + return nullptr; } @@ -2962,7 +2962,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects, // global objects for (uint32 i = 0; i < adGame->_objects.size(); i++) { obj = adGame->_objects[i]; - if (obj->_active && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) { + if (obj->_active && (obj->_stickRegion == region || region == nullptr || (obj->_stickRegion == nullptr && region->pointInRegion(obj->_posX, obj->_posY)))) { if (interactiveOnly && !obj->_registrable) { continue; } @@ -2974,7 +2974,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects, // scene objects for (uint32 i = 0; i < _objects.size(); i++) { obj = _objects[i]; - if (obj->_active && !obj->_editorOnly && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) { + if (obj->_active && !obj->_editorOnly && (obj->_stickRegion == region || region == nullptr || (obj->_stickRegion == nullptr && region->pointInRegion(obj->_posX, obj->_posY)))) { if (interactiveOnly && !obj->_registrable) { continue; } diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h index 230cb77f5b..9cc8135889 100644 --- a/engines/wintermute/ad/ad_scene.h +++ b/engines/wintermute/ad/ad_scene.h @@ -67,19 +67,19 @@ public: bool pointInViewport(int x, int y); int getOffsetTop(); int getOffsetLeft(); - bool getViewportSize(int *width = NULL, int *height = NULL); - bool getViewportOffset(int *offsetX = NULL, int *offsetY = NULL); + bool getViewportSize(int *width = nullptr, int *height = nullptr); + bool getViewportOffset(int *offsetX = nullptr, int *offsetY = nullptr); BaseViewport *_viewport; BaseFader *_fader; int _pfPointsNum; void pfPointsAdd(int x, int y, int distance); void pfPointsStart(); bool _initialized; - bool correctTargetPoint(int startX, int startY, int *x, int *y, bool checkFreeObjects = false, BaseObject *requester = NULL); + bool correctTargetPoint(int startX, int startY, int *x, int *y, bool checkFreeObjects = false, BaseObject *requester = nullptr); bool correctTargetPoint2(int startX, int startY, int *targetX, int *targetY, bool checkFreeObjects, BaseObject *requester); DECLARE_PERSISTENT(AdScene, BaseObject) - bool displayRegionContent(AdRegion *region = NULL, bool display3DOnly = false); - bool displayRegionContentOld(AdRegion *region = NULL); + bool displayRegionContent(AdRegion *region = nullptr, bool display3DOnly = false); + bool displayRegionContentOld(AdRegion *region = nullptr); static bool compareObjs(const AdObject *obj1, const AdObject *obj2); bool updateFreeObjects(); @@ -113,11 +113,11 @@ public: uint32 _pfMaxTime; bool initLoop(); void pathFinderStep(); - bool isBlockedAt(int x, int y, bool checkFreeObjects = false, BaseObject *requester = NULL); - bool isWalkableAt(int x, int y, bool checkFreeObjects = false, BaseObject *requester = NULL); + bool isBlockedAt(int x, int y, bool checkFreeObjects = false, BaseObject *requester = nullptr); + bool isWalkableAt(int x, int y, bool checkFreeObjects = false, BaseObject *requester = nullptr); AdLayer *_mainLayer; float getZoomAt(int x, int y); - bool getPath(BasePoint source, BasePoint target, AdPath *path, BaseObject *requester = NULL); + bool getPath(BasePoint source, BasePoint target, AdPath *path, BaseObject *requester = nullptr); AdScene(BaseGame *inGame); virtual ~AdScene(); BaseArray<AdLayer *> _layers; @@ -153,7 +153,7 @@ public: BaseArray<AdRotLevel *> _rotLevels; virtual bool restoreDeviceObjects(); - int getPointsDist(BasePoint p1, BasePoint p2, BaseObject *requester = NULL); + int getPointsDist(BasePoint p1, BasePoint p2, BaseObject *requester = nullptr); // scripting interface virtual ScValue *scGetProperty(const Common::String &name); @@ -164,7 +164,7 @@ public: private: bool persistState(bool saving = true); - void pfAddWaypointGroup(AdWaypointGroup *Wpt, BaseObject *requester = NULL); + void pfAddWaypointGroup(AdWaypointGroup *Wpt, BaseObject *requester = nullptr); bool _pfReady; BasePoint *_pfTarget; AdPath *_pfTargetPath; diff --git a/engines/wintermute/ad/ad_scene_node.cpp b/engines/wintermute/ad/ad_scene_node.cpp index d0202236fd..f84e9212e5 100644 --- a/engines/wintermute/ad/ad_scene_node.cpp +++ b/engines/wintermute/ad/ad_scene_node.cpp @@ -36,18 +36,18 @@ IMPLEMENT_PERSISTENT(AdSceneNode, false) ////////////////////////////////////////////////////////////////////////// AdSceneNode::AdSceneNode(BaseGame *inGame) : BaseObject(inGame) { _type = OBJECT_NONE; - _region = NULL; - _entity = NULL; + _region = nullptr; + _entity = nullptr; } ////////////////////////////////////////////////////////////////////////// AdSceneNode::~AdSceneNode() { _gameRef->unregisterObject(_region); - _region = NULL; + _region = nullptr; _gameRef->unregisterObject(_entity); - _entity = NULL; + _entity = nullptr; } diff --git a/engines/wintermute/ad/ad_scene_state.cpp b/engines/wintermute/ad/ad_scene_state.cpp index e6dd08a5fe..8e022ab115 100644 --- a/engines/wintermute/ad/ad_scene_state.cpp +++ b/engines/wintermute/ad/ad_scene_state.cpp @@ -38,14 +38,14 @@ IMPLEMENT_PERSISTENT(AdSceneState, false) ////////////////////////////////////////////////////////////////////////// AdSceneState::AdSceneState(BaseGame *inGame) : BaseClass(inGame) { - _filename = NULL; + _filename = nullptr; } ////////////////////////////////////////////////////////////////////////// AdSceneState::~AdSceneState() { delete[] _filename; - _filename = NULL; + _filename = nullptr; for (uint32 i = 0; i < _nodeStates.size(); i++) { delete _nodeStates[i]; @@ -91,7 +91,7 @@ AdNodeState *AdSceneState::getNodeState(const char *name, bool saving) { return ret; } else { - return NULL; + return nullptr; } } diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp index cfe4191b07..47b22a1ab3 100644 --- a/engines/wintermute/ad/ad_sentence.cpp +++ b/engines/wintermute/ad/ad_sentence.cpp @@ -45,27 +45,27 @@ IMPLEMENT_PERSISTENT(AdSentence, false) ////////////////////////////////////////////////////////////////////////// AdSentence::AdSentence(BaseGame *inGame) : BaseClass(inGame) { - _text = NULL; - _stances = NULL; - _tempStance = NULL; + _text = nullptr; + _stances = nullptr; + _tempStance = nullptr; _duration = 0; _startTime = 0; _currentStance = 0; - _font = NULL; + _font = nullptr; _pos.x = _pos.y = 0; _width = _gameRef->_renderer->_width; _align = (TTextAlign)TAL_CENTER; - _sound = NULL; + _sound = nullptr; _soundStarted = false; - _talkDef = NULL; - _currentSprite = NULL; - _currentSkelAnim = NULL; + _talkDef = nullptr; + _currentSprite = nullptr; + _currentSkelAnim = nullptr; _fixedPos = false; _freezable = true; } @@ -78,15 +78,15 @@ AdSentence::~AdSentence() { delete[] _stances; delete[] _tempStance; delete _talkDef; - _sound = NULL; - _text = NULL; - _stances = NULL; - _tempStance = NULL; - _talkDef = NULL; - - _currentSprite = NULL; // ref only - _currentSkelAnim = NULL; - _font = NULL; // ref only + _sound = nullptr; + _text = nullptr; + _stances = nullptr; + _tempStance = nullptr; + _talkDef = nullptr; + + _currentSprite = nullptr; // ref only + _currentSkelAnim = nullptr; + _font = nullptr; // ref only } @@ -113,7 +113,7 @@ void AdSentence::setStances(const char *stances) { strcpy(_stances, stances); } } else { - _stances = NULL; + _stances = nullptr; } } @@ -133,14 +133,14 @@ char *AdSentence::getNextStance() { ////////////////////////////////////////////////////////////////////////// char *AdSentence::getStance(int stance) { - if (_stances == NULL) { - return NULL; + if (_stances == nullptr) { + return nullptr; } if (_tempStance) { delete[] _tempStance; } - _tempStance = NULL; + _tempStance = nullptr; char *start; char *curr; @@ -150,7 +150,7 @@ char *AdSentence::getStance(int stance) { start = _stances; } else { pos = 0; - start = NULL; + start = nullptr; curr = _stances; while (pos < stance) { if (*curr == '\0') { @@ -166,8 +166,8 @@ char *AdSentence::getStance(int stance) { } } - if (start == NULL) { - return NULL; + if (start == nullptr) { + return nullptr; } while (*start == ' ' && *start != ',' && *start != '\0') { @@ -274,8 +274,8 @@ bool AdSentence::persist(BasePersistenceManager *persistMgr) { ////////////////////////////////////////////////////////////////////////// bool AdSentence::setupTalkFile(const char *soundFilename) { delete _talkDef; - _talkDef = NULL; - _currentSprite = NULL; + _talkDef = nullptr; + _currentSprite = nullptr; if (!soundFilename) { return STATUS_OK; @@ -294,7 +294,7 @@ bool AdSentence::setupTalkFile(const char *soundFilename) { _talkDef = new AdTalkDef(_gameRef); if (!_talkDef || DID_FAIL(_talkDef->loadFile(talkDefFileName.c_str()))) { delete _talkDef; - _talkDef = NULL; + _talkDef = nullptr; return STATUS_FAILED; } //_gameRef->LOG(0, "Using .talk file: %s", TalkDefFile); @@ -345,7 +345,7 @@ bool AdSentence::update(TDirection dir) { } _currentSprite = newSprite; } else { - _currentSprite = NULL; + _currentSprite = nullptr; } } diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp index 345b483a8f..ffa7bb2530 100644 --- a/engines/wintermute/ad/ad_sprite_set.cpp +++ b/engines/wintermute/ad/ad_sprite_set.cpp @@ -42,7 +42,7 @@ AdSpriteSet::AdSpriteSet(BaseGame *inGame, BaseObject *owner) : BaseObject(inGam _owner = owner; for (int i = 0; i < NUM_DIRECTIONS; i++) { - _sprites[i] = NULL; + _sprites[i] = nullptr; } } @@ -51,17 +51,17 @@ AdSpriteSet::AdSpriteSet(BaseGame *inGame, BaseObject *owner) : BaseObject(inGam AdSpriteSet::~AdSpriteSet() { for (int i = 0; i < NUM_DIRECTIONS; i++) { delete _sprites[i]; - _sprites[i] = NULL; + _sprites[i] = nullptr; } - _owner = NULL; + _owner = nullptr; } ////////////////////////////////////////////////////////////////////////// bool AdSpriteSet::loadFile(const char *filename, int lifeTime, TSpriteCacheType cacheType) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdSpriteSet::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -121,7 +121,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC buffer = params; } - BaseSprite *spr = NULL; + BaseSprite *spr = nullptr; while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { switch (cmd) { case TOKEN_TEMPLATE: @@ -136,7 +136,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_LEFT: delete _sprites[DI_LEFT]; - _sprites[DI_LEFT] = NULL; + _sprites[DI_LEFT] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -147,7 +147,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_RIGHT: delete _sprites[DI_RIGHT]; - _sprites[DI_RIGHT] = NULL; + _sprites[DI_RIGHT] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -158,7 +158,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_UP: delete _sprites[DI_UP]; - _sprites[DI_UP] = NULL; + _sprites[DI_UP] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -169,7 +169,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_DOWN: delete _sprites[DI_DOWN]; - _sprites[DI_DOWN] = NULL; + _sprites[DI_DOWN] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -180,7 +180,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_UP_LEFT: delete _sprites[DI_UPLEFT]; - _sprites[DI_UPLEFT] = NULL; + _sprites[DI_UPLEFT] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -191,7 +191,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_UP_RIGHT: delete _sprites[DI_UPRIGHT]; - _sprites[DI_UPRIGHT] = NULL; + _sprites[DI_UPRIGHT] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -202,7 +202,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_DOWN_LEFT: delete _sprites[DI_DOWNLEFT]; - _sprites[DI_DOWNLEFT] = NULL; + _sprites[DI_DOWNLEFT] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -213,7 +213,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC case TOKEN_DOWN_RIGHT: delete _sprites[DI_DOWNRIGHT]; - _sprites[DI_DOWNRIGHT] = NULL; + _sprites[DI_DOWNRIGHT] = nullptr; spr = new BaseSprite(_gameRef, _owner); if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) { cmd = PARSERR_GENERIC; @@ -268,12 +268,12 @@ BaseSprite *AdSpriteSet::getSprite(TDirection direction) { dir = NUM_DIRECTIONS - 1; } - BaseSprite *ret = NULL; + BaseSprite *ret = nullptr; // find nearest set sprite int numSteps = 0; for (int i = dir; i >= 0; i--) { - if (_sprites[i] != NULL) { + if (_sprites[i] != nullptr) { ret = _sprites[i]; numSteps = dir - i; break; @@ -281,8 +281,8 @@ BaseSprite *AdSpriteSet::getSprite(TDirection direction) { } for (int i = dir; i < NUM_DIRECTIONS; i++) { - if (_sprites[i] != NULL) { - if (ret == NULL || numSteps > i - dir) { + if (_sprites[i] != nullptr) { + if (ret == nullptr || numSteps > i - dir) { return _sprites[i]; } else { return ret; diff --git a/engines/wintermute/ad/ad_sprite_set.h b/engines/wintermute/ad/ad_sprite_set.h index ba5da0ff2e..3960b5dcc7 100644 --- a/engines/wintermute/ad/ad_sprite_set.h +++ b/engines/wintermute/ad/ad_sprite_set.h @@ -41,7 +41,7 @@ public: BaseSprite *getSprite(TDirection direction); DECLARE_PERSISTENT(AdSpriteSet, BaseObject) BaseObject *_owner; - AdSpriteSet(BaseGame *inGame, BaseObject *owner = NULL); + AdSpriteSet(BaseGame *inGame, BaseObject *owner = nullptr); virtual ~AdSpriteSet(); bool loadFile(const char *filename, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL); bool loadBuffer(byte *buffer, bool complete = true, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL); diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp index a85cd7f986..4ad5d2ccc6 100644 --- a/engines/wintermute/ad/ad_talk_def.cpp +++ b/engines/wintermute/ad/ad_talk_def.cpp @@ -42,11 +42,11 @@ IMPLEMENT_PERSISTENT(AdTalkDef, false) ////////////////////////////////////////////////////////////////////////// AdTalkDef::AdTalkDef(BaseGame *inGame) : BaseObject(inGame) { - _defaultSpriteFilename = NULL; - _defaultSprite = NULL; + _defaultSpriteFilename = nullptr; + _defaultSprite = nullptr; - _defaultSpriteSetFilename = NULL; - _defaultSpriteSet = NULL; + _defaultSpriteSetFilename = nullptr; + _defaultSpriteSet = nullptr; } @@ -59,20 +59,20 @@ AdTalkDef::~AdTalkDef() { delete[] _defaultSpriteFilename; delete _defaultSprite; - _defaultSpriteFilename = NULL; - _defaultSprite = NULL; + _defaultSpriteFilename = nullptr; + _defaultSprite = nullptr; delete[] _defaultSpriteSetFilename; delete _defaultSpriteSet; - _defaultSpriteSetFilename = NULL; - _defaultSpriteSet = NULL; + _defaultSpriteSetFilename = nullptr; + _defaultSpriteSet = nullptr; } ////////////////////////////////////////////////////////////////////////// bool AdTalkDef::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdTalkDef::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -138,7 +138,7 @@ bool AdTalkDef::loadBuffer(byte *buffer, bool complete) { _nodes.add(node); } else { delete node; - node = NULL; + node = nullptr; cmd = PARSERR_GENERIC; } } @@ -157,7 +157,7 @@ bool AdTalkDef::loadBuffer(byte *buffer, bool complete) { _defaultSpriteSet = new AdSpriteSet(_gameRef); if (!_defaultSpriteSet || DID_FAIL(_defaultSpriteSet->loadBuffer(params, false))) { delete _defaultSpriteSet; - _defaultSpriteSet = NULL; + _defaultSpriteSet = nullptr; cmd = PARSERR_GENERIC; } } @@ -181,8 +181,8 @@ bool AdTalkDef::loadBuffer(byte *buffer, bool complete) { delete _defaultSprite; delete _defaultSpriteSet; - _defaultSprite = NULL; - _defaultSpriteSet = NULL; + _defaultSprite = nullptr; + _defaultSpriteSet = nullptr; if (_defaultSpriteFilename) { _defaultSprite = new BaseSprite(_gameRef); @@ -250,7 +250,7 @@ bool AdTalkDef::loadDefaultSprite() { _defaultSprite = new BaseSprite(_gameRef); if (!_defaultSprite || DID_FAIL(_defaultSprite->loadFile(_defaultSpriteFilename))) { delete _defaultSprite; - _defaultSprite = NULL; + _defaultSprite = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -259,7 +259,7 @@ bool AdTalkDef::loadDefaultSprite() { _defaultSpriteSet = new AdSpriteSet(_gameRef); if (!_defaultSpriteSet || DID_FAIL(_defaultSpriteSet->loadFile(_defaultSpriteSetFilename))) { delete _defaultSpriteSet; - _defaultSpriteSet = NULL; + _defaultSpriteSet = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -278,7 +278,7 @@ BaseSprite *AdTalkDef::getDefaultSprite(TDirection dir) { } else if (_defaultSpriteSet) { return _defaultSpriteSet->getSprite(dir); } else { - return NULL; + return nullptr; } } diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp index 937a4b333d..ed2333a345 100644 --- a/engines/wintermute/ad/ad_talk_holder.cpp +++ b/engines/wintermute/ad/ad_talk_holder.cpp @@ -43,14 +43,14 @@ IMPLEMENT_PERSISTENT(AdTalkHolder, false) ////////////////////////////////////////////////////////////////////////// AdTalkHolder::AdTalkHolder(BaseGame *inGame) : AdObject(inGame) { - _sprite = NULL; + _sprite = nullptr; } ////////////////////////////////////////////////////////////////////////// AdTalkHolder::~AdTalkHolder() { delete _sprite; - _sprite = NULL; + _sprite = nullptr; for (uint32 i = 0; i < _talkSprites.size(); i++) { delete _talkSprites[i]; @@ -65,7 +65,7 @@ AdTalkHolder::~AdTalkHolder() { ////////////////////////////////////////////////////////////////////////// BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { - BaseSprite *ret = NULL; + BaseSprite *ret = nullptr; // forced stance? @@ -78,7 +78,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { if (DID_FAIL(res)) { _gameRef->LOG(res, "AdTalkHolder::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", getName(), _forcedTalkAnimName); delete _animSprite; - _animSprite = NULL; + _animSprite = nullptr; } else { return _animSprite; } @@ -86,7 +86,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { } - if (stance != NULL) { + if (stance != nullptr) { // search special talk stances for (uint32 i = 0; i < _talkSpritesEx.size(); i++) { if (scumm_stricmp(_talkSpritesEx[i]->getName(), stance) == 0) { @@ -94,7 +94,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { break; } } - if (ret == NULL) { + if (ret == nullptr) { // serach generic talk stances for (uint32 i = 0; i < _talkSprites.size(); i++) { if (scumm_stricmp(_talkSprites[i]->getName(), stance) == 0) { @@ -106,7 +106,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { } // not a valid stance? get a random one - if (ret == NULL) { + if (ret == nullptr) { if (_talkSprites.size() < 1) { ret = _sprite; } else { @@ -138,12 +138,12 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS } delete _sprite; - _sprite = NULL; + _sprite = nullptr; if (val->isNULL()) { - _sprite = NULL; + _sprite = nullptr; if (setCurrent) { - _currentSprite = NULL; + _currentSprite = nullptr; } stack->pushBool(true); } else { diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp index c909ee27ff..2e0985ed99 100644 --- a/engines/wintermute/ad/ad_talk_node.cpp +++ b/engines/wintermute/ad/ad_talk_node.cpp @@ -39,11 +39,11 @@ IMPLEMENT_PERSISTENT(AdTalkNode, false) ////////////////////////////////////////////////////////////////////////// AdTalkNode::AdTalkNode(BaseGame *inGame) : BaseClass(inGame) { - _sprite = NULL; - _spriteFilename = NULL; - _spriteSet = NULL; - _spriteSetFilename = NULL; - _comment = NULL; + _sprite = nullptr; + _spriteFilename = nullptr; + _spriteSet = nullptr; + _spriteSetFilename = nullptr; + _comment = nullptr; _startTime = _endTime = 0; _playToEnd = false; @@ -58,11 +58,11 @@ AdTalkNode::~AdTalkNode() { delete[] _spriteSetFilename; delete _spriteSet; delete _comment; - _spriteFilename = NULL; - _sprite = NULL; - _spriteSetFilename = NULL; - _spriteSet = NULL; - _comment = NULL; + _spriteFilename = nullptr; + _sprite = nullptr; + _spriteSetFilename = nullptr; + _spriteSet = nullptr; + _comment = nullptr; } @@ -123,7 +123,7 @@ bool AdTalkNode::loadBuffer(byte *buffer, bool complete) { _spriteSet = new AdSpriteSet(_gameRef); if (!_spriteSet || DID_FAIL(_spriteSet->loadBuffer(params, false))) { delete _spriteSet; - _spriteSet = NULL; + _spriteSet = nullptr; cmd = PARSERR_GENERIC; } } @@ -240,7 +240,7 @@ bool AdTalkNode::loadSprite() { _sprite = new BaseSprite(_gameRef); if (!_sprite || DID_FAIL(_sprite->loadFile(_spriteFilename))) { delete _sprite; - _sprite = NULL; + _sprite = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -249,7 +249,7 @@ bool AdTalkNode::loadSprite() { _spriteSet = new AdSpriteSet(_gameRef); if (!_spriteSet || DID_FAIL(_spriteSet->loadFile(_spriteSetFilename))) { delete _spriteSet; - _spriteSet = NULL; + _spriteSet = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -264,9 +264,9 @@ bool AdTalkNode::loadSprite() { bool AdTalkNode::isInTimeInterval(uint32 time, TDirection dir) { if (time >= _startTime) { if (_playToEnd) { - if ((_spriteFilename && _sprite == NULL) || (_sprite && _sprite->isFinished() == false)) { + if ((_spriteFilename && _sprite == nullptr) || (_sprite && _sprite->isFinished() == false)) { return true; - } else if ((_spriteSetFilename && _spriteSet == NULL) || (_spriteSet && _spriteSet->getSprite(dir) && _spriteSet->getSprite(dir)->isFinished() == false)) { + } else if ((_spriteSetFilename && _spriteSet == nullptr) || (_spriteSet && _spriteSet->getSprite(dir) && _spriteSet->getSprite(dir)->isFinished() == false)) { return true; } else { return false; @@ -288,7 +288,7 @@ BaseSprite *AdTalkNode::getSprite(TDirection dir) { } else if (_spriteSet) { return _spriteSet->getSprite(dir); } else { - return NULL; + return nullptr; } } diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp index 81493ce769..96dece34b8 100644 --- a/engines/wintermute/ad/ad_waypoint_group.cpp +++ b/engines/wintermute/ad/ad_waypoint_group.cpp @@ -67,7 +67,7 @@ void AdWaypointGroup::cleanup() { ////////////////////////////////////////////////////////////////////////// bool AdWaypointGroup::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "AdWaypointGroup::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp index e351792e61..c0459b0ce5 100644 --- a/engines/wintermute/base/base.cpp +++ b/engines/wintermute/base/base.cpp @@ -42,7 +42,7 @@ BaseClass::BaseClass(BaseGame *gameOwner) { ////////////////////////////////////////////////////////////////////////// BaseClass::BaseClass() { - _gameRef = NULL; + _gameRef = nullptr; _persistable = true; } @@ -111,8 +111,8 @@ bool BaseClass::parseEditorProperty(byte *buffer, bool complete) { buffer = params; } - char *propName = NULL; - char *propValue = NULL; + char *propName = nullptr; + char *propValue = nullptr; while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { switch (cmd) { @@ -141,16 +141,16 @@ bool BaseClass::parseEditorProperty(byte *buffer, bool complete) { if (cmd == PARSERR_TOKENNOTFOUND) { delete[] propName; delete[] propValue; - propName = NULL; - propValue = NULL; + propName = nullptr; + propValue = nullptr; _gameRef->LOG(0, "Syntax error in EDITOR_PROPERTY definition"); return STATUS_FAILED; } - if (cmd == PARSERR_GENERIC || propName == NULL || propValue == NULL) { + if (cmd == PARSERR_GENERIC || propName == nullptr || propValue == nullptr) { delete[] propName; delete[] propValue; - propName = NULL; - propValue = NULL; + propName = nullptr; + propValue = nullptr; _gameRef->LOG(0, "Error loading EDITOR_PROPERTY definition"); return STATUS_FAILED; } @@ -160,8 +160,8 @@ bool BaseClass::parseEditorProperty(byte *buffer, bool complete) { delete[] propName; delete[] propValue; - propName = NULL; - propValue = NULL; + propName = nullptr; + propValue = nullptr; return STATUS_OK; } diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h index 24820c748a..7f2796c6e0 100644 --- a/engines/wintermute/base/base.h +++ b/engines/wintermute/base/base.h @@ -44,7 +44,7 @@ class BaseClass { public: bool _persistable; bool setEditorProp(const Common::String &propName, const Common::String &propValue); - Common::String getEditorProp(const Common::String &propName, const Common::String &initVal = NULL); + Common::String getEditorProp(const Common::String &propName, const Common::String &initVal = nullptr); BaseClass(TDynamicConstructor, TDynamicConstructor) {} bool parseEditorProperty(byte *buffer, bool complete = true); virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent = 0); diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp index 4addf15be8..4c62cf9561 100644 --- a/engines/wintermute/base/base_active_rect.cpp +++ b/engines/wintermute/base/base_active_rect.cpp @@ -37,9 +37,9 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////// BaseActiveRect::BaseActiveRect(BaseGame *inGame) : BaseClass(inGame) { BasePlatform::setRectEmpty(&_rect); - _owner = NULL; - _frame = NULL; - _region = NULL; + _owner = nullptr; + _frame = nullptr; + _region = nullptr; _zoomX = 100; _zoomY = 100; _offsetX = _offsetY = 0; @@ -55,7 +55,7 @@ BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseSubFrame _zoomX = zoomX; _zoomY = zoomY; _precise = precise; - _region = NULL; + _region = nullptr; _offsetX = _offsetY = 0; clipRect(); } @@ -69,7 +69,7 @@ BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion * _zoomX = 100; _zoomY = 100; _precise = true; - _frame = NULL; + _frame = nullptr; clipRect(); _offsetX = offsetX; _offsetY = offsetY; @@ -78,9 +78,9 @@ BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion * ////////////////////////////////////////////////////////////////////// BaseActiveRect::~BaseActiveRect() { - _owner = NULL; - _frame = NULL; - _region = NULL; + _owner = nullptr; + _frame = nullptr; + _region = nullptr; } diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h index fcd2619b03..7ef8374814 100644 --- a/engines/wintermute/base/base_active_rect.h +++ b/engines/wintermute/base/base_active_rect.h @@ -48,7 +48,7 @@ public: int _offsetX; int _offsetY; Rect32 _rect; - BaseActiveRect(BaseGame *inGameOwner = NULL); + BaseActiveRect(BaseGame *inGameOwner = nullptr); BaseActiveRect(BaseGame *inGameOwner, BaseObject *owner, BaseSubFrame *frame, int x, int y, int width, int height, float zoomX = 100, float zoomY = 100, bool precise = true); BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion *region, int offsetX, int offsetY); virtual ~BaseActiveRect(); diff --git a/engines/wintermute/base/base_dynamic_buffer.cpp b/engines/wintermute/base/base_dynamic_buffer.cpp index dc14a4e052..f684420b1e 100644 --- a/engines/wintermute/base/base_dynamic_buffer.cpp +++ b/engines/wintermute/base/base_dynamic_buffer.cpp @@ -33,7 +33,7 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseDynamicBuffer::BaseDynamicBuffer(BaseGame *inGame, uint32 initSize, uint32 growBy) { - _buffer = NULL; + _buffer = nullptr; _size = 0; _realSize = 0; @@ -56,7 +56,7 @@ void BaseDynamicBuffer::cleanup() { if (_buffer) { free(_buffer); } - _buffer = NULL; + _buffer = nullptr; _size = 0; _realSize = 0; _offset = 0; @@ -164,7 +164,7 @@ char *BaseDynamicBuffer::getString() { _offset += len; if (!strcmp(ret, "(null)")) { - return NULL; + return nullptr; } else { return ret; } diff --git a/engines/wintermute/base/base_engine.cpp b/engines/wintermute/base/base_engine.cpp index 8146d14beb..a13ca4d919 100644 --- a/engines/wintermute/base/base_engine.cpp +++ b/engines/wintermute/base/base_engine.cpp @@ -39,10 +39,10 @@ DECLARE_SINGLETON(Wintermute::BaseEngine); namespace Wintermute { BaseEngine::BaseEngine() { - _fileManager = NULL; - _gameRef = NULL; - _classReg = NULL; - _rnd = NULL; + _fileManager = nullptr; + _gameRef = nullptr; + _classReg = nullptr; + _rnd = nullptr; _gameId = ""; } diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index b726c0c66f..08358f9033 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -31,7 +31,6 @@ #include "engines/wintermute/base/file/base_disk_file.h" #include "engines/wintermute/base/file/base_save_thumb_file.h" #include "engines/wintermute/base/file/base_package.h" -#include "engines/wintermute/base/file/base_resources.h" #include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/wintermute.h" #include "common/debug.h" @@ -45,6 +44,7 @@ #include "common/file.h" #include "common/savefile.h" #include "common/fs.h" +#include "common/unzip.h" namespace Wintermute { @@ -55,6 +55,8 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////// BaseFileManager::BaseFileManager(Common::Language lang) { _language = lang; + _resources = nullptr; + initResources(); initPaths(); registerPackages(); } @@ -79,37 +81,41 @@ bool BaseFileManager::cleanup() { // delete packages _packages.clear(); + // get rid of the resources: + delete _resources; + _resources = NULL; + return STATUS_OK; } ////////////////////////////////////////////////////////////////////// byte *BaseFileManager::readWholeFile(const Common::String &filename, uint32 *size, bool mustExist) { - byte *buffer = NULL; + byte *buffer = nullptr; Common::SeekableReadStream *file = openFile(filename); if (!file) { if (mustExist) { debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error opening file '%s'", filename.c_str()); } - return NULL; + return nullptr; } buffer = new byte[file->size() + 1]; - if (buffer == NULL) { + if (buffer == nullptr) { debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error allocating buffer for file '%s' (%d bytes)", filename.c_str(), file->size() + 1); closeFile(file); - return NULL; + return nullptr; } if (file->read(buffer, (uint32)file->size()) != (uint32)file->size()) { debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error reading file '%s'", filename.c_str()); closeFile(file); delete[] buffer; - return NULL; + return nullptr; }; buffer[file->size()] = '\0'; - if (size != NULL) { + if (size != nullptr) { *size = file->size(); } closeFile(file); @@ -224,11 +230,21 @@ bool BaseFileManager::registerPackage(Common::FSNode file, const Common::String return STATUS_OK; } +void BaseFileManager::initResources() { + _resources = Common::makeZipArchive("wintermute.zip"); + if (!_resources) { + error("Couldn't load wintermute.zip"); + } + assert(_resources->hasFile("syste_font.bmp")); + assert(_resources->hasFile("invalid.bmp")); + assert(_resources->hasFile("invalid_debug.bmp")); +} + ////////////////////////////////////////////////////////////////////////// Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &filename) { Common::String upcName = filename; upcName.toUppercase(); - Common::SeekableReadStream *file = NULL; + Common::SeekableReadStream *file = nullptr; char fileName[MAX_PATH_LENGTH]; strcpy(fileName, upcName.c_str()); @@ -240,7 +256,7 @@ Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &f } Common::ArchiveMemberPtr entry = _packages.getMember(upcName); if (!entry) { - return NULL; + return nullptr; } file = entry->createReadStream(); return file; @@ -261,7 +277,7 @@ bool BaseFileManager::hasFile(const Common::String &filename) { if (_packages.hasFile(filename)) { return true; // We don't bother checking if the file can actually be opened, something bigger is wrong if that is the case. } - if (BaseResources::hasFile(filename)) { + if (_resources->hasFile(filename)) { return true; } return false; @@ -270,7 +286,7 @@ bool BaseFileManager::hasFile(const Common::String &filename) { ////////////////////////////////////////////////////////////////////////// Common::SeekableReadStream *BaseFileManager::openFile(const Common::String &filename, bool absPathWarning, bool keepTrackOf) { if (strcmp(filename.c_str(), "") == 0) { - return NULL; + return nullptr; } debugC(kWintermuteDebugFileAccess, "Open file %s", filename.c_str()); @@ -297,7 +313,7 @@ bool BaseFileManager::closeFile(Common::SeekableReadStream *File) { ////////////////////////////////////////////////////////////////////////// Common::SeekableReadStream *BaseFileManager::openFileRaw(const Common::String &filename) { - Common::SeekableReadStream *ret = NULL; + Common::SeekableReadStream *ret = nullptr; if (scumm_strnicmp(filename.c_str(), "savegame:", 9) == 0) { if (!BaseEngine::instance().getGameRef()) { @@ -321,20 +337,20 @@ Common::SeekableReadStream *BaseFileManager::openFileRaw(const Common::String &f return ret; } - ret = BaseResources::getFile(filename); + ret = _resources->createReadStreamForMember(filename); if (ret) { return ret; } debugC(kWintermuteDebugFileAccess ,"BFileManager::OpenFileRaw - Failed to open %s", filename.c_str()); - return NULL; + return nullptr; } BaseFileManager *BaseFileManager::getEngineInstance() { if (BaseEngine::instance().getFileManager()) { return BaseEngine::instance().getFileManager(); } - return NULL; + return nullptr; } } // end of namespace Wintermute diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h index 70aff49bbb..5fc626a314 100644 --- a/engines/wintermute/base/base_file_manager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -43,7 +43,7 @@ public: bool closeFile(Common::SeekableReadStream *File); bool hasFile(const Common::String &filename); Common::SeekableReadStream *openFile(const Common::String &filename, bool absPathWarning = true, bool keepTrackOf = true); - byte *readWholeFile(const Common::String &filename, uint32 *size = NULL, bool mustExist = true); + byte *readWholeFile(const Common::String &filename, uint32 *size = nullptr, bool mustExist = true); BaseFileManager(Common::Language lang); virtual ~BaseFileManager(); @@ -59,6 +59,7 @@ private: bool initPaths(); bool addPath(TPathType type, const Common::FSNode &path); bool registerPackages(); + void initResources(); Common::SeekableReadStream *openFileRaw(const Common::String &filename); Common::SeekableReadStream *openPkgFile(const Common::String &filename); Common::FSList _packagePaths; @@ -67,6 +68,7 @@ private: Common::SearchSet _packages; Common::Array<Common::SeekableReadStream *> _openFiles; Common::Language _language; + Common::Archive *_resources; // This class is intentionally not a subclass of Base, as it needs to be used by // the detector too, without launching the entire engine: }; diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index 7c64144480..8a190c729b 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -48,7 +48,7 @@ BaseFrame::BaseFrame(BaseGame *inGame) : BaseScriptable(inGame, true) { _delay = 0; _moveX = _moveY = 0; - _sound = NULL; + _sound = nullptr; _killSound = false; _editorExpanded = false; @@ -59,7 +59,7 @@ BaseFrame::BaseFrame(BaseGame *inGame) : BaseScriptable(inGame, true) { ////////////////////////////////////////////////////////////////////// BaseFrame::~BaseFrame() { delete _sound; - _sound = NULL; + _sound = nullptr; for (uint32 i = 0; i < _subframes.size(); i++) { delete _subframes[i]; @@ -68,7 +68,7 @@ BaseFrame::~BaseFrame() { for (uint32 i = 0; i < _applyEvent.size(); i++) { delete[] _applyEvent[i]; - _applyEvent[i] = NULL; + _applyEvent[i] = nullptr; } _applyEvent.clear(); } @@ -181,7 +181,7 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { bool mirrorX = false; bool mirrorY = false; BasePlatform::setRectEmpty(&rect); - char *surface_file = NULL; + char *surface_file = nullptr; while ((cmd = parser.getCommand((char **)&buffer, commands, ¶ms)) > 0) { switch (cmd) { @@ -260,7 +260,7 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { case TOKEN_SOUND: { if (_sound) { delete _sound; - _sound = NULL; + _sound = nullptr; } _sound = new BaseSound(_gameRef); if (!_sound || DID_FAIL(_sound->setSound(params, Audio::Mixer::kSFXSoundType, false))) { @@ -268,7 +268,7 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { _gameRef->LOG(0, "Error loading sound '%s'.", params); } delete _sound; - _sound = NULL; + _sound = nullptr; } } break; @@ -305,7 +305,7 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { BaseSubFrame *sub = new BaseSubFrame(_gameRef); - if (surface_file != NULL) { + if (surface_file != nullptr) { if (custoTrans) { sub->setSurface(surface_file, false, r, g, b, lifeTime, keepLoaded); } else { @@ -452,14 +452,14 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac stack->correctParams(1); ScValue *val = stack->pop(); delete _sound; - _sound = NULL; + _sound = nullptr; if (!val->isNULL()) { _sound = new BaseSound(_gameRef); if (!_sound || DID_FAIL(_sound->setSound(val->getString(), Audio::Mixer::kSFXSoundType, false))) { stack->pushBool(false); delete _sound; - _sound = NULL; + _sound = nullptr; } else { stack->pushBool(true); } @@ -516,13 +516,13 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac else if (strcmp(name, "AddSubframe") == 0) { stack->correctParams(1); ScValue *val = stack->pop(); - const char *filename = NULL; + const char *filename = nullptr; if (!val->isNULL()) { filename = val->getString(); } BaseSubFrame *sub = new BaseSubFrame(_gameRef); - if (filename != NULL) { + if (filename != nullptr) { sub->setSurface(filename); sub->setDefaultRect(); } @@ -543,13 +543,13 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac } ScValue *val = stack->pop(); - const char *filename = NULL; + const char *filename = nullptr; if (!val->isNULL()) { filename = val->getString(); } BaseSubFrame *sub = new BaseSubFrame(_gameRef); - if (filename != NULL) { + if (filename != nullptr) { sub->setSurface(filename); } diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h index 7c5d893e70..5ed0b92bba 100644 --- a/engines/wintermute/base/base_frame.h +++ b/engines/wintermute/base/base_frame.h @@ -51,7 +51,7 @@ public: int _moveX; uint32 _delay; BaseArray<BaseSubFrame *> _subframes; - bool draw(int x, int y, BaseObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, bool allFrames = false, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); + bool draw(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, bool allFrames = false, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); bool loadBuffer(byte *buffer, int lifeTime, bool keepLoaded); BaseFrame(BaseGame *inGame); diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index 46acd8cd98..0248c349e7 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -34,7 +34,6 @@ #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/base/font/base_font.h" #include "engines/wintermute/base/font/base_font_storage.h" -#include "engines/wintermute/base/gfx/base_image.h" #include "engines/wintermute/base/gfx/base_renderer.h" #include "engines/wintermute/base/base_keyboard_state.h" #include "engines/wintermute/base/base_parser.h" @@ -92,30 +91,30 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _interactive = true; _origInteractive = false; - _surfaceStorage = NULL; - _fontStorage = NULL; - _renderer = NULL; - _soundMgr = NULL; - _transMgr = NULL; - _scEngine = NULL; - _keyboardState = NULL; + _surfaceStorage = nullptr; + _fontStorage = nullptr; + _renderer = nullptr; + _soundMgr = nullptr; + _transMgr = nullptr; + _scEngine = nullptr; + _keyboardState = nullptr; - _mathClass = NULL; + _mathClass = nullptr; - _debugLogFile = NULL; + _debugLogFile = nullptr; _debugDebugMode = false; _debugShowFPS = false; - _systemFont = NULL; - _videoFont = NULL; + _systemFont = nullptr; + _videoFont = nullptr; - _videoPlayer = NULL; - _theoraPlayer = NULL; + _videoPlayer = nullptr; + _theoraPlayer = nullptr; - _mainObject = NULL; - _activeObject = NULL; + _mainObject = nullptr; + _activeObject = nullptr; - _fader = NULL; + _fader = nullptr; _offsetX = _offsetY = 0; _offsetPercentX = _offsetPercentY = 0.0f; @@ -135,12 +134,12 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _mousePos.x = _mousePos.y = 0; _mouseLeftDown = _mouseRightDown = _mouseMidlleDown = false; - _capturedObject = NULL; + _capturedObject = nullptr; // FPS counters _lastTime = _fpsTime = _deltaTime = _framesRendered = _fps = 0; - _cursorNoninteractive = NULL; + _cursorNoninteractive = nullptr; _useD3D = false; @@ -154,7 +153,7 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _settingsRequireSound = false; _settingsTLMode = 0; _settingsAllowWindowed = true; - _settingsGameFile = NULL; + _settingsGameFile = nullptr; _settingsAllowAdvanced = false; _settingsAllowAccessTab = true; _settingsAllowAboutTab = true; @@ -163,7 +162,7 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _editorForceScripts = false; _editorAlwaysRegister = false; - _focusedWindow = NULL; + _focusedWindow = nullptr; _loadInProgress = false; @@ -177,8 +176,8 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _editorMode = false; //_doNotExpandStrings = false; - _engineLogCallback = NULL; - _engineLogCallbackData = NULL; + _engineLogCallback = nullptr; + _engineLogCallbackData = nullptr; _smartCache = false; _surfaceGCCycleTime = 10000; @@ -199,7 +198,7 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _saveDirChecked = false; - _loadingIcon = NULL; + _loadingIcon = nullptr; _loadingIconX = _loadingIconY = 0; _loadingIconPersistent = false; @@ -209,7 +208,7 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _soundBufferSizeSec = 3; _suspendedRendering = false; - _lastCursor = NULL; + _lastCursor = nullptr; BasePlatform::setRectEmpty(&_mouseLockRect); @@ -217,7 +216,7 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam _lastMiniUpdate = 0; _miniUpdateEnabled = false; - _cachedThumbnail = NULL; + _cachedThumbnail = nullptr; _autorunDisabled = false; @@ -273,23 +272,23 @@ BaseGame::~BaseGame() { delete _stringTable; delete _musicSystem; - _settingsGameFile = NULL; + _settingsGameFile = nullptr; - _cachedThumbnail = NULL; + _cachedThumbnail = nullptr; - _mathClass = NULL; + _mathClass = nullptr; - _transMgr = NULL; - _scEngine = NULL; - _fontStorage = NULL; - _surfaceStorage = NULL; - _videoPlayer = NULL; - _theoraPlayer = NULL; - _soundMgr = NULL; + _transMgr = nullptr; + _scEngine = nullptr; + _fontStorage = nullptr; + _surfaceStorage = nullptr; + _videoPlayer = nullptr; + _theoraPlayer = nullptr; + _soundMgr = nullptr; - _renderer = NULL; - _stringTable = NULL; - _musicSystem = NULL; + _renderer = nullptr; + _stringTable = nullptr; + _musicSystem = nullptr; DEBUG_DebugDisable(); debugC(kWintermuteDebugLog, "--- shutting down normally ---\n"); @@ -299,48 +298,48 @@ BaseGame::~BaseGame() { ////////////////////////////////////////////////////////////////////////// bool BaseGame::cleanup() { delete _loadingIcon; - _loadingIcon = NULL; + _loadingIcon = nullptr; - _engineLogCallback = NULL; - _engineLogCallbackData = NULL; + _engineLogCallback = nullptr; + _engineLogCallbackData = nullptr; _musicSystem->cleanup(); unregisterObject(_fader); - _fader = NULL; + _fader = nullptr; for (uint32 i = 0; i < _regObjects.size(); i++) { delete _regObjects[i]; - _regObjects[i] = NULL; + _regObjects[i] = nullptr; } _regObjects.clear(); _windows.clear(); // refs only - _focusedWindow = NULL; // ref only + _focusedWindow = nullptr; // ref only delete _cursorNoninteractive; delete _cursor; delete _activeCursor; - _cursorNoninteractive = NULL; - _cursor = NULL; - _activeCursor = NULL; + _cursorNoninteractive = nullptr; + _cursor = nullptr; + _activeCursor = nullptr; delete _scValue; delete _sFX; - _scValue = NULL; - _sFX = NULL; + _scValue = nullptr; + _sFX = nullptr; for (uint32 i = 0; i < _scripts.size(); i++) { - _scripts[i]->_owner = NULL; + _scripts[i]->_owner = nullptr; _scripts[i]->finish(); } _scripts.clear(); _fontStorage->removeFont(_systemFont); - _systemFont = NULL; + _systemFont = nullptr; _fontStorage->removeFont(_videoFont); - _videoFont = NULL; + _videoFont = nullptr; for (uint32 i = 0; i < _quickMessages.size(); i++) { delete _quickMessages[i]; @@ -350,17 +349,17 @@ bool BaseGame::cleanup() { _viewportStack.clear(); _viewportSP = -1; - setName(NULL); - setFilename(NULL); + setName(nullptr); + setFilename(nullptr); for (int i = 0; i < 7; i++) { delete[] _caption[i]; - _caption[i] = NULL; + _caption[i] = nullptr; } - _lastCursor = NULL; + _lastCursor = nullptr; delete _keyboardState; - _keyboardState = NULL; + _keyboardState = nullptr; return STATUS_OK; } @@ -371,47 +370,47 @@ bool BaseGame::initialize1() { bool loaded = false; // Not really a loop, but a goto-replacement. while (!loaded) { _surfaceStorage = new BaseSurfaceStorage(this); - if (_surfaceStorage == NULL) { + if (_surfaceStorage == nullptr) { break; } _fontStorage = new BaseFontStorage(this); - if (_fontStorage == NULL) { + if (_fontStorage == nullptr) { break; } _soundMgr = new BaseSoundMgr(this); - if (_soundMgr == NULL) { + if (_soundMgr == nullptr) { break; } _mathClass = makeSXMath(this); - if (_mathClass == NULL) { + if (_mathClass == nullptr) { break; } _scEngine = new ScEngine(this); - if (_scEngine == NULL) { + if (_scEngine == nullptr) { break; } _videoPlayer = new VideoPlayer(this); - if (_videoPlayer == NULL) { + if (_videoPlayer == nullptr) { break; } _transMgr = new BaseTransitionMgr(this); - if (_transMgr == NULL) { + if (_transMgr == nullptr) { break; } _keyboardState = new BaseKeyboardState(this); - if (_keyboardState == NULL) { + if (_keyboardState == nullptr) { break; } _fader = new BaseFader(this); - if (_fader == NULL) { + if (_fader == nullptr) { break; } registerObject(_fader); @@ -437,7 +436,7 @@ bool BaseGame::initialize1() { ////////////////////////////////////////////////////////////////////// bool BaseGame::initialize2() { // we know whether we are going to be accelerated _renderer = makeOSystemRenderer(this); - if (_renderer == NULL) { + if (_renderer == nullptr) { return STATUS_FAILED; } @@ -480,10 +479,10 @@ void BaseGame::DEBUG_DebugEnable(const char *filename) { ////////////////////////////////////////////////////////////////////// void BaseGame::DEBUG_DebugDisable() { - if (_debugLogFile != NULL) { + if (_debugLogFile != nullptr) { LOG(0, "********** DEBUG LOG CLOSED ********************************************"); //fclose((FILE *)_debugLogFile); - _debugLogFile = NULL; + _debugLogFile = nullptr; } _debugDebugMode = false; } @@ -538,7 +537,7 @@ bool BaseGame::initLoop() { _fontStorage->initLoop(); - //_activeObject = NULL; + //_activeObject = nullptr; // count FPS _deltaTime = _currentTime - _lastTime; @@ -567,7 +566,7 @@ bool BaseGame::initLoop() { getMousePos(&_mousePos); - _focusedWindow = NULL; + _focusedWindow = nullptr; for (int i = _windows.size() - 1; i >= 0; i--) { if (_windows[i]->_visible) { _focusedWindow = _windows[i]; @@ -605,10 +604,10 @@ void BaseGame::setOffset(int offsetX, int offsetY) { ////////////////////////////////////////////////////////////////////////// void BaseGame::getOffset(int *offsetX, int *offsetY) { - if (offsetX != NULL) { + if (offsetX != nullptr) { *offsetX = _offsetX; } - if (offsetY != NULL) { + if (offsetY != nullptr) { *offsetY = _offsetY; } } @@ -617,7 +616,7 @@ void BaseGame::getOffset(int *offsetX, int *offsetY) { ////////////////////////////////////////////////////////////////////////// bool BaseGame::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "BaseGame::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -768,7 +767,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { if (_systemFont) { _fontStorage->removeFont(_systemFont); } - _systemFont = NULL; + _systemFont = nullptr; _systemFont = _gameRef->_fontStorage->addFont((char *)params); break; @@ -777,7 +776,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { if (_videoFont) { _fontStorage->removeFont(_videoFont); } - _videoFont = NULL; + _videoFont = nullptr; _videoFont = _gameRef->_fontStorage->addFont((char *)params); break; @@ -788,18 +787,18 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; case TOKEN_ACTIVE_CURSOR: delete _activeCursor; - _activeCursor = NULL; + _activeCursor = nullptr; _activeCursor = new BaseSprite(_gameRef); if (!_activeCursor || DID_FAIL(_activeCursor->loadFile((char *)params))) { delete _activeCursor; - _activeCursor = NULL; + _activeCursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -809,7 +808,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) { _cursorNoninteractive = new BaseSprite(_gameRef); if (!_cursorNoninteractive || DID_FAIL(_cursorNoninteractive->loadFile((char *)params))) { delete _cursorNoninteractive; - _cursorNoninteractive = NULL; + _cursorNoninteractive = nullptr; cmd = PARSERR_GENERIC; } break; @@ -1057,7 +1056,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack stack->pushNative(win, true); } else { delete win; - win = NULL; + win = nullptr; stack->pushNULL(); } return STATUS_OK; @@ -1147,7 +1146,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack bool freezeMusic = stack->pop()->getBool(true); ScValue *valSub = stack->pop(); - const char *subtitleFile = valSub->isNULL() ? NULL : valSub->getString(); + const char *subtitleFile = valSub->isNULL() ? nullptr : valSub->getString(); if (type < (int)VID_PLAY_POS || type > (int)VID_PLAY_CENTER) { type = (int)VID_PLAY_STRETCH; @@ -1187,7 +1186,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack bool dropFrames = stack->pop()->getBool(true); ScValue *valSub = stack->pop(); - const char *subtitleFile = valSub->isNULL() ? NULL : valSub->getString(); + const char *subtitleFile = valSub->isNULL() ? nullptr : valSub->getString(); if (type < (int)VID_PLAY_POS || type > (int)VID_PLAY_CENTER) { type = (int)VID_PLAY_STRETCH; @@ -1206,7 +1205,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack } else { stack->pushBool(false); delete _theoraPlayer; - _theoraPlayer = NULL; + _theoraPlayer = nullptr; } return STATUS_OK; @@ -1471,7 +1470,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack else if (strcmp(name, "RemoveActiveCursor") == 0) { stack->correctParams(0); delete _activeCursor; - _activeCursor = NULL; + _activeCursor = nullptr; stack->pushNULL(); return STATUS_OK; @@ -1577,14 +1576,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack fileNum++; } - bool ret = false; - BaseImage *image = _gameRef->_renderer->takeScreenshot(); - if (image) { - ret = DID_SUCCEED(image->saveBMPFile(filename)); - delete image; - } else { - ret = false; - } + bool ret = _gameRef->_renderer->saveScreenShot(filename); stack->pushBool(ret); return STATUS_OK; @@ -1599,17 +1591,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack int sizeX = stack->pop()->getInt(_renderer->_width); int sizeY = stack->pop()->getInt(_renderer->_height); - bool ret = false; - BaseImage *image = _gameRef->_renderer->takeScreenshot(); - if (image) { - ret = DID_SUCCEED(image->resize(sizeX, sizeY)); - if (ret) { - ret = DID_SUCCEED(image->saveBMPFile(filename)); - } - delete image; - } else { - ret = false; - } + bool ret = _gameRef->_renderer->saveScreenShot(filename, sizeX, sizeY); stack->pushBool(ret); return STATUS_OK; @@ -1724,7 +1706,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack else if (strcmp(name, "RemoveWaitCursor") == 0) { stack->correctParams(0); delete _cursorNoninteractive; - _cursorNoninteractive = NULL; + _cursorNoninteractive = nullptr; stack->pushNULL(); @@ -1783,7 +1765,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _loadingIcon = new BaseSprite(this); if (!_loadingIcon || DID_FAIL(_loadingIcon->loadFile(filename))) { delete _loadingIcon; - _loadingIcon = NULL; + _loadingIcon = nullptr; } else { displayContent(false, true); _gameRef->_renderer->flip(); @@ -1800,7 +1782,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack else if (strcmp(name, "HideLoadingIcon") == 0) { stack->correctParams(0); delete _loadingIcon; - _loadingIcon = NULL; + _loadingIcon = nullptr; stack->pushNULL(); return STATUS_OK; } @@ -1840,7 +1822,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _cachedThumbnail = new BaseSaveThumbHelper(this); if (DID_FAIL(_cachedThumbnail->storeThumbnail())) { delete _cachedThumbnail; - _cachedThumbnail = NULL; + _cachedThumbnail = nullptr; stack->pushBool(false); } else { stack->pushBool(true); @@ -1855,7 +1837,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack else if (strcmp(name, "DeleteSaveThumbnail") == 0) { stack->correctParams(0); delete _cachedThumbnail; - _cachedThumbnail = NULL; + _cachedThumbnail = nullptr; stack->pushNULL(); return STATUS_OK; @@ -1894,7 +1876,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack } BaseFileManager::getEngineInstance()->closeFile(file); - file = NULL; + file = nullptr; } else { stack->pushNULL(); } @@ -2397,7 +2379,7 @@ bool BaseGame::scSetProperty(const char *name, ScValue *value) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "MainObject") == 0) { BaseScriptable *obj = value->getNative(); - if (obj == NULL || validObject((BaseObject *)obj)) { + if (obj == nullptr || validObject((BaseObject *)obj)) { _mainObject = (BaseObject *)obj; } return STATUS_OK; @@ -2633,7 +2615,7 @@ bool BaseGame::unregisterObject(BaseObject *object) { // get new focused window if (_focusedWindow == object) { - _focusedWindow = NULL; + _focusedWindow = nullptr; } break; @@ -2642,12 +2624,12 @@ bool BaseGame::unregisterObject(BaseObject *object) { // is it active object? if (_activeObject == object) { - _activeObject = NULL; + _activeObject = nullptr; } // is it main object? if (_mainObject == object) { - _mainObject = NULL; + _mainObject = nullptr; } // destroy object @@ -2673,7 +2655,7 @@ void BaseGame::invalidateValues(void *value, void *data) { if (!val->_persistent && ((BaseScriptable *)data)->_refCount == 1) { ((BaseScriptable *)data)->_refCount++; } - val->setNative(NULL); + val->setNative(nullptr); val->setNULL(); } } @@ -3036,8 +3018,8 @@ bool BaseGame::displayWindows(bool inGame) { bool res; // did we lose focus? focus topmost window - if (_focusedWindow == NULL || !_focusedWindow->_visible || _focusedWindow->_disable) { - _focusedWindow = NULL; + if (_focusedWindow == nullptr || !_focusedWindow->_visible || _focusedWindow->_disable) { + _focusedWindow = nullptr; for (int i = _windows.size() - 1; i >= 0; i--) { if (_windows[i]->_visible && !_windows[i]->_disable) { _focusedWindow = _windows[i]; @@ -3083,7 +3065,7 @@ bool BaseGame::loadSettings(const char *filename) { byte *origBuffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (origBuffer == NULL) { + if (origBuffer == nullptr) { _gameRef->LOG(0, "BaseGame::LoadSettings failed for file '%s'", filename); return STATUS_FAILED; } @@ -3207,6 +3189,7 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_lastTime)); persistMgr->transfer(TMEMBER(_mainObject)); _musicSystem->persistChannels(persistMgr); + _musicSystem->persistCrossfadeSettings(persistMgr); persistMgr->transfer(TMEMBER(_offsetX)); persistMgr->transfer(TMEMBER(_offsetY)); @@ -3238,8 +3221,6 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_liveTimerDelta)); persistMgr->transfer(TMEMBER(_liveTimerLast)); - _musicSystem->persistCrossfadeSettings(persistMgr); - _renderer->persistSaveLoadImages(persistMgr); persistMgr->transfer(TMEMBER_INT(_textEncoding)); @@ -3446,7 +3427,7 @@ void BaseGame::setWindowTitle() { bool BaseGame::setActiveObject(BaseObject *obj) { // not-active when game is frozen if (obj && !_gameRef->_interactive && !obj->_nonIntMouseEvents) { - obj = NULL; + obj = nullptr; } if (obj == _activeObject) { @@ -3501,7 +3482,7 @@ bool BaseGame::popViewport() { ////////////////////////////////////////////////////////////////////////// bool BaseGame::getCurrentViewportRect(Rect32 *rect, bool *custom) { - if (rect == NULL) { + if (rect == nullptr) { return STATUS_FAILED; } else { if (_viewportSP >= 0) { @@ -3635,12 +3616,12 @@ bool BaseGame::restoreDeviceObjects() { ////////////////////////////////////////////////////////////////////////// bool BaseGame::setWaitCursor(const char *filename) { delete _cursorNoninteractive; - _cursorNoninteractive = NULL; + _cursorNoninteractive = nullptr; _cursorNoninteractive = new BaseSprite(_gameRef); if (!_cursorNoninteractive || DID_FAIL(_cursorNoninteractive->loadFile(filename))) { delete _cursorNoninteractive; - _cursorNoninteractive = NULL; + _cursorNoninteractive = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -3666,7 +3647,7 @@ bool BaseGame::stopVideo() { if (_theoraPlayer && _theoraPlayer->isPlaying()) { _theoraPlayer->stop(); delete _theoraPlayer; - _theoraPlayer = NULL; + _theoraPlayer = nullptr; } return STATUS_OK; } @@ -3717,12 +3698,12 @@ bool BaseGame::onMouseLeftDown() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("LeftClick"); } } - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _capturedObject = _activeObject; } _mouseLeftDown = true; @@ -3738,12 +3719,12 @@ bool BaseGame::onMouseLeftUp() { } BasePlatform::releaseCapture(); - _capturedObject = NULL; + _capturedObject = nullptr; _mouseLeftDown = false; bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftRelease")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("LeftRelease"); } } @@ -3762,7 +3743,7 @@ bool BaseGame::onMouseLeftDblClick() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftDoubleClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("LeftDoubleClick"); } } @@ -3781,7 +3762,7 @@ bool BaseGame::onMouseRightDblClick() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightDoubleClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("RightDoubleClick"); } } @@ -3796,7 +3777,7 @@ bool BaseGame::onMouseRightDown() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("RightClick"); } } @@ -3811,7 +3792,7 @@ bool BaseGame::onMouseRightUp() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightRelease")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("RightRelease"); } } @@ -3830,7 +3811,7 @@ bool BaseGame::onMouseMiddleDown() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("MiddleClick")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("MiddleClick"); } } @@ -3845,7 +3826,7 @@ bool BaseGame::onMouseMiddleUp() { bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("MiddleRelease")); if (!handled) { - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _activeObject->applyEvent("MiddleRelease"); } } @@ -3907,7 +3888,7 @@ bool BaseGame::displayDebugInfo() { sprintf(str, "Timer: %d", _timer); _gameRef->_systemFont->drawText((byte *)str, 0, 130, _renderer->_width, TAL_RIGHT); - if (_activeObject != NULL) { + if (_activeObject != nullptr) { _systemFont->drawText((const byte *)_activeObject->getName(), 0, 150, _renderer->_width, TAL_RIGHT); } diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 75cf3fd832..5666fb818c 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -119,14 +119,15 @@ public: int _offsetX; float _offsetPercentX; float _offsetPercentY; - BaseObject *_mainObject; + + inline BaseObject *getMainObject() { return _mainObject; } + inline BaseFont *getSystemFont() { return _systemFont; } bool initInput(); bool initLoop(); uint32 _currentTime; uint32 _deltaTime; - BaseFont *_systemFont; - BaseFont *_videoFont; + bool initialize1(); bool initialize2(); bool initialize3(); @@ -144,7 +145,7 @@ public: virtual ~BaseGame(); void DEBUG_DebugDisable(); - void DEBUG_DebugEnable(const char *filename = NULL); + void DEBUG_DebugEnable(const char *filename = nullptr); bool _debugDebugMode; void *_debugLogFile; @@ -236,8 +237,8 @@ public: void setInteractive(bool state); virtual bool windowLoadHook(UIWindow *win, char **buf, char **params); virtual bool windowScriptMethodHook(UIWindow *win, ScScript *script, ScStack *stack, const char *name); - bool getCurrentViewportOffset(int *offsetX = NULL, int *offsetY = NULL); - bool getCurrentViewportRect(Rect32 *rect, bool *custom = NULL); + bool getCurrentViewportOffset(int *offsetX = nullptr, int *offsetY = nullptr); + bool getCurrentViewportRect(Rect32 *rect, bool *custom = nullptr); bool popViewport(); bool pushViewport(BaseViewport *Viewport); bool setActiveObject(BaseObject *Obj); @@ -249,6 +250,9 @@ public: bool _touchInterface; bool _constrainedMemory; protected: + BaseFont *_systemFont; + BaseFont *_videoFont; + BaseSprite *_loadingIcon; int _loadingIconX; int _loadingIconY; @@ -260,6 +264,8 @@ protected: VideoPlayer *_videoPlayer; VideoTheoraPlayer *_theoraPlayer; private: + BaseObject *_mainObject; + bool _mouseRightDown; bool _mouseMidlleDown; bool _settingsRequireAcceleration; @@ -287,7 +293,7 @@ private: uint32 _framesRendered; Common::String _gameId; - void setEngineLogCallback(ENGINE_LOG_CALLBACK callback = NULL, void *data = NULL); + void setEngineLogCallback(ENGINE_LOG_CALLBACK callback = nullptr, void *data = nullptr); ENGINE_LOG_CALLBACK _engineLogCallback; void *_engineLogCallbackData; diff --git a/engines/wintermute/base/base_game_music.cpp b/engines/wintermute/base/base_game_music.cpp index 365fa6e212..8dff41d854 100644 --- a/engines/wintermute/base/base_game_music.cpp +++ b/engines/wintermute/base/base_game_music.cpp @@ -39,7 +39,7 @@ namespace Wintermute { BaseGameMusic::BaseGameMusic(BaseGame *gameRef) : _gameRef(gameRef) { for (int i = 0; i < NUM_MUSIC_CHANNELS; i++) { - _music[i] = NULL; + _music[i] = nullptr; _musicStartTime[i] = 0; } @@ -54,7 +54,7 @@ BaseGameMusic::BaseGameMusic(BaseGame *gameRef) : _gameRef(gameRef) { void BaseGameMusic::cleanup() { for (int i = 0; i < NUM_MUSIC_CHANNELS; i++) { delete _music[i]; - _music[i] = NULL; + _music[i] = nullptr; _musicStartTime[i] = 0; } } @@ -67,7 +67,7 @@ bool BaseGameMusic::playMusic(int channel, const char *filename, bool looping, u } delete _music[channel]; - _music[channel] = NULL; + _music[channel] = nullptr; _music[channel] = new BaseSound(_gameRef); if (_music[channel] && DID_SUCCEED(_music[channel]->setSound(filename, Audio::Mixer::kMusicSoundType, true))) { @@ -81,7 +81,7 @@ bool BaseGameMusic::playMusic(int channel, const char *filename, bool looping, u return _music[channel]->play(looping); } else { delete _music[channel]; - _music[channel] = NULL; + _music[channel] = nullptr; return STATUS_FAILED; } } @@ -97,7 +97,7 @@ bool BaseGameMusic::stopMusic(int channel) { if (_music[channel]) { _music[channel]->stop(); delete _music[channel]; - _music[channel] = NULL; + _music[channel] = nullptr; return STATUS_OK; } else { return STATUS_FAILED; @@ -494,7 +494,7 @@ bool BaseGameMusic::scCallMethod(ScScript *script, ScStack *stack, ScStack *this if (sound && DID_SUCCEED(sound->setSound(filename, Audio::Mixer::kMusicSoundType, true))) { length = sound->getLength(); delete sound; - sound = NULL; + sound = nullptr; } stack->pushInt(length); return STATUS_OK; diff --git a/engines/wintermute/base/base_named_object.cpp b/engines/wintermute/base/base_named_object.cpp index 915bf24d7f..f99ec2f5db 100644 --- a/engines/wintermute/base/base_named_object.cpp +++ b/engines/wintermute/base/base_named_object.cpp @@ -32,38 +32,38 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseNamedObject::BaseNamedObject(BaseGame *inGame) : BaseClass(inGame) { - _name = NULL; + _name = nullptr; } ////////////////////////////////////////////////////////////////////////// BaseNamedObject::BaseNamedObject() : BaseClass() { - _name = NULL; + _name = nullptr; } ////////////////////////////////////////////////////////////////////////// BaseNamedObject::BaseNamedObject(TDynamicConstructor, TDynamicConstructor) { - _name = NULL; + _name = nullptr; } ////////////////////////////////////////////////////////////////////////// BaseNamedObject::~BaseNamedObject(void) { delete[] _name; - _name = NULL; + _name = nullptr; } ////////////////////////////////////////////////////////////////////// void BaseNamedObject::setName(const char *name) { delete[] _name; - _name = NULL; + _name = nullptr; - if (name == NULL) { + if (name == nullptr) { return; } _name = new char [strlen(name) + 1]; - if (_name != NULL) { + if (_name != nullptr) { strcpy(_name, name); } } diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp index eba8416485..898c0497a2 100644 --- a/engines/wintermute/base/base_object.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -60,18 +60,18 @@ BaseObject::BaseObject(BaseGame *inGame) : BaseScriptHolder(inGame) { _ready = true; - _soundEvent = NULL; + _soundEvent = nullptr; _iD = _gameRef->getSequence(); BasePlatform::setRectEmpty(&_rect); _rectSet = false; - _cursor = NULL; - _activeCursor = NULL; + _cursor = nullptr; + _activeCursor = nullptr; _sharedCursors = false; - _sFX = NULL; + _sFX = nullptr; _sFXStart = 0; _sFXVolume = 100; _autoSoundPanning = true; @@ -86,7 +86,7 @@ BaseObject::BaseObject(BaseGame *inGame) : BaseScriptHolder(inGame) { _relativeRotate = 0.0f; for (int i = 0; i < 7; i++) { - _caption[i] = NULL; + _caption[i] = nullptr; } _saveState = true; @@ -109,25 +109,25 @@ BaseObject::~BaseObject() { ////////////////////////////////////////////////////////////////////////// bool BaseObject::cleanup() { if (_gameRef && _gameRef->_activeObject == this) { - _gameRef->_activeObject = NULL; + _gameRef->_activeObject = nullptr; } BaseScriptHolder::cleanup(); delete[] _soundEvent; - _soundEvent = NULL; + _soundEvent = nullptr; if (!_sharedCursors) { delete _cursor; delete _activeCursor; - _cursor = NULL; - _activeCursor = NULL; + _cursor = nullptr; + _activeCursor = nullptr; } delete _sFX; - _sFX = NULL; + _sFX = nullptr; for (int i = 0; i < 7; i++) { delete[] _caption[i]; - _caption[i] = NULL; + _caption[i] = nullptr; } _sFXType = SFX_NONE; @@ -160,7 +160,7 @@ const char *BaseObject::getCaption(int caseVal) { if (caseVal == 0) { caseVal = 1; } - if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == NULL) { + if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == nullptr) { return ""; } else { return _caption[caseVal - 1]; @@ -223,9 +223,9 @@ bool BaseObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta stack->correctParams(0); if (!_sharedCursors) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; } else { - _cursor = NULL; + _cursor = nullptr; } stack->pushNULL(); @@ -317,12 +317,12 @@ bool BaseObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta ScValue *val3 = stack->pop(); if (val1->_type == VAL_BOOL) { - filename = NULL; + filename = nullptr; looping = val1->getBool(); loopStart = val2->getInt(); } else { if (val1->isNULL()) { - filename = NULL; + filename = nullptr; } else { filename = val1->getString(); } @@ -351,7 +351,7 @@ bool BaseObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta ScValue *val2 = stack->pop(); if (val2->isNULL()) { - filename = NULL; + filename = nullptr; eventName = val1->getString(); } else { filename = val1->getString(); @@ -1010,14 +1010,14 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) { bool BaseObject::setCursor(const char *filename) { if (!_sharedCursors) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; } _sharedCursors = false; _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile(filename))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -1031,7 +1031,7 @@ bool BaseObject::setActiveCursor(const char *filename) { _activeCursor = new BaseSprite(_gameRef); if (!_activeCursor || DID_FAIL(_activeCursor->loadFile(filename))) { delete _activeCursor; - _activeCursor = NULL; + _activeCursor = nullptr; return STATUS_FAILED; } else { return STATUS_OK; @@ -1066,7 +1066,7 @@ bool BaseObject::handleMouseWheel(int delta) { ////////////////////////////////////////////////////////////////////////// bool BaseObject::playSFX(const char *filename, bool looping, bool playNow, const char *eventName, uint32 loopStart) { // just play loaded sound - if (filename == NULL && _sFX) { + if (filename == nullptr && _sFX) { if (_gameRef->_editorMode || _sFXStart) { _sFX->setVolumePercent(_sFXVolume); _sFX->setPositionTime(_sFXStart); @@ -1085,7 +1085,7 @@ bool BaseObject::playSFX(const char *filename, bool looping, bool playNow, const } } - if (filename == NULL) { + if (filename == nullptr) { return STATUS_FAILED; } @@ -1111,7 +1111,7 @@ bool BaseObject::playSFX(const char *filename, bool looping, bool playNow, const } } else { delete _sFX; - _sFX = NULL; + _sFX = nullptr; return STATUS_FAILED; } } @@ -1123,7 +1123,7 @@ bool BaseObject::stopSFX(bool deleteSound) { _sFX->stop(); if (deleteSound) { delete _sFX; - _sFX = NULL; + _sFX = nullptr; } return STATUS_OK; } else { @@ -1179,7 +1179,7 @@ bool BaseObject::updateSounds() { if (_soundEvent) { if (_sFX && !_sFX->isPlaying()) { applyEvent(_soundEvent); - setSoundEvent(NULL); + setSoundEvent(nullptr); } } @@ -1229,7 +1229,7 @@ bool BaseObject::isReady() { ////////////////////////////////////////////////////////////////////////// void BaseObject::setSoundEvent(const char *eventName) { delete[] _soundEvent; - _soundEvent = NULL; + _soundEvent = nullptr; if (eventName) { _soundEvent = new char[strlen(eventName) + 1]; if (_soundEvent) { diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h index 96fed2b847..c8491c2cf6 100644 --- a/engines/wintermute/base/base_object.h +++ b/engines/wintermute/base/base_object.h @@ -52,7 +52,7 @@ protected: bool resumeSFX(); bool pauseSFX(); bool stopSFX(bool deleteSound = true); - bool playSFX(const char *filename, bool looping = false, bool playNow = true, const char *eventName = NULL, uint32 loopStart = 0); + bool playSFX(const char *filename, bool looping = false, bool playNow = true, const char *eventName = nullptr, uint32 loopStart = 0); BaseSound *_sFX; TSFXType _sFXType; float _sFXParam1; diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index 9a0e9e3ad9..7f18c1f0cf 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -51,7 +51,7 @@ BaseParser::BaseParser() { ////////////////////////////////////////////////////////////////////// BaseParser::~BaseParser() { - if (_whiteSpace != NULL) { + if (_whiteSpace != nullptr) { delete[] _whiteSpace; } } @@ -136,7 +136,7 @@ void BaseParser::skipCharacters(char **buf, const char *toSkip) { if (ch == '\n') { _parserLine++; } - if (strchr(toSkip, ch) == NULL) { + if (strchr(toSkip, ch) == nullptr) { return; } ++*buf; // skip this character @@ -250,10 +250,10 @@ Common::String BaseParser::getToken(char **buf) { *t++ = 0; } else if (*b == 0) { *buf = b; - return NULL; + return nullptr; } else { // Error. - return NULL; + return nullptr; } *buf = b; diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h index 76ca8ea856..87a936c624 100644 --- a/engines/wintermute/base/base_parser.h +++ b/engines/wintermute/base/base_parser.h @@ -70,7 +70,7 @@ public: virtual ~BaseParser(); private: char *getLastOffender(); - void skipToken(char **buf, char *tok, char *msg = NULL); + void skipToken(char **buf, char *tok, char *msg = nullptr); int getTokenInt(char **buf); float getTokenFloat(char **buf); Common::String getToken(char **buf); diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index accb0a8fd3..84a1c2ec67 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -47,40 +47,40 @@ namespace Wintermute { -#define SAVE_BUFFER_INIT_SIZE 100000 -#define SAVE_BUFFER_GROW_BY 50000 - -#define SAVE_MAGIC 0x45564153 -#define SAVE_MAGIC_2 0x32564153 +// The original WME-Lite savegames had the following: +//#define SAVE_MAGIC 0x45564153 +//#define SAVE_MAGIC_2 0x32564153 +// In case anyone tries to load original savegames, or for that matter +// in case we ever want to attempt to support original savegames, we +// avoid those numbers, and use this instead: +#define SAVE_MAGIC_3 0x12564154 ////////////////////////////////////////////////////////////////////////// BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool deleteSingleton) { _saving = false; -// _buffer = NULL; -// _bufferSize = 0; _offset = 0; - _saveStream = NULL; - _loadStream = NULL; + _saveStream = nullptr; + _loadStream = nullptr; _deleteSingleton = deleteSingleton; if (BaseEngine::instance().getGameRef()) { _gameRef = BaseEngine::instance().getGameRef(); } else { - _gameRef = NULL; + _gameRef = nullptr; } - _richBuffer = NULL; + _richBuffer = nullptr; _richBufferSize = 0; - _scummVMThumbnailData = NULL; + _scummVMThumbnailData = nullptr; _scummVMThumbSize = 0; - _savedDescription = NULL; + _savedDescription = nullptr; // _savedTimestamp = 0; _savedVerMajor = _savedVerMinor = _savedVerBuild = 0; _savedExtMajor = _savedExtMinor = 0; _thumbnailDataSize = 0; - _thumbnailData = NULL; + _thumbnailData = nullptr; if (savePrefix) { _savePrefix = savePrefix; } else if (_gameRef) { @@ -94,28 +94,21 @@ BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool dele ////////////////////////////////////////////////////////////////////////// BasePersistenceManager::~BasePersistenceManager() { cleanup(); - if (_deleteSingleton && BaseEngine::instance().getGameRef() == NULL) + if (_deleteSingleton && BaseEngine::instance().getGameRef() == nullptr) BaseEngine::destroy(); } ////////////////////////////////////////////////////////////////////////// void BasePersistenceManager::cleanup() { - /* if (_buffer) { - if (_saving) free(_buffer); - else delete[] _buffer; // allocated by file manager - } - _buffer = NULL; - - _bufferSize = 0;*/ _offset = 0; delete[] _richBuffer; - _richBuffer = NULL; + _richBuffer = nullptr; _richBufferSize = 0; delete[] _savedDescription; - _savedDescription = NULL; // ref to buffer + _savedDescription = nullptr; // ref to buffer // _savedTimestamp = 0; _savedVerMajor = _savedVerMinor = _savedVerBuild = 0; _savedExtMajor = _savedExtMinor = 0; @@ -123,19 +116,19 @@ void BasePersistenceManager::cleanup() { _thumbnailDataSize = 0; if (_thumbnailData) { delete[] _thumbnailData; - _thumbnailData = NULL; + _thumbnailData = nullptr; } _scummVMThumbSize = 0; if (_scummVMThumbnailData) { delete[] _scummVMThumbnailData; - _scummVMThumbnailData = NULL; + _scummVMThumbnailData = nullptr; } delete _loadStream; delete _saveStream; - _loadStream = NULL; - _saveStream = NULL; + _loadStream = nullptr; + _saveStream = nullptr; } Common::String BasePersistenceManager::getFilenameForSlot(int slot) const { @@ -147,7 +140,7 @@ void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &des Common::String filename = getFilenameForSlot(slot); debugC(kWintermuteDebugSaveGame, "Trying to list savegame %s in slot %d", filename.c_str(), slot); if (DID_FAIL(readHeader(filename))) { - warning("getSavedDesc(%d) - Failed for %s", slot, filename.c_str()); + debugC(kWintermuteDebugSaveGame, "getSavedDesc(%d) - Failed for %s", slot, filename.c_str()); return; } desc.setSaveSlot(slot); @@ -156,7 +149,7 @@ void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &des desc.setWriteProtectedFlag(false); int thumbSize = 0; - byte *thumbData = NULL; + byte *thumbData = nullptr; if (_scummVMThumbSize > 0) { thumbSize = _scummVMThumbSize; thumbData = _scummVMThumbnailData; @@ -228,19 +221,18 @@ bool BasePersistenceManager::initSave(const char *desc) { _gameRef->_cachedThumbnail = new BaseSaveThumbHelper(_gameRef); if (DID_FAIL(_gameRef->_cachedThumbnail->storeThumbnail(true))) { delete _gameRef->_cachedThumbnail; - _gameRef->_cachedThumbnail = NULL; + _gameRef->_cachedThumbnail = nullptr; } } uint32 magic = DCGF_MAGIC; putDWORD(magic); - magic = SAVE_MAGIC_2; + magic = SAVE_MAGIC_3; putDWORD(magic); byte verMajor, verMinor, extMajor, extMinor; _gameRef->getVersion(&verMajor, &verMinor, &extMajor, &extMinor); - //uint32 version = MAKELONG(MAKEWORD(VerMajor, VerMinor), MAKEWORD(ExtMajor, ExtMinor)); _saveStream->writeByte(verMajor); _saveStream->writeByte(verMinor); _saveStream->writeByte(extMajor); @@ -291,7 +283,7 @@ bool BasePersistenceManager::initSave(const char *desc) { // in any case, destroy the cached thumbnail once used delete _gameRef->_cachedThumbnail; - _gameRef->_cachedThumbnail = NULL; + _gameRef->_cachedThumbnail = nullptr; uint32 dataOffset = _offset + sizeof(uint32) + // data offset @@ -315,7 +307,7 @@ bool BasePersistenceManager::readHeader(const Common::String &filename) { _saving = false; _loadStream = g_system->getSavefileManager()->openForLoading(filename); - //_buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename, &_bufferSize); + if (_loadStream) { uint32 magic; magic = getDWORD(); @@ -327,37 +319,32 @@ bool BasePersistenceManager::readHeader(const Common::String &filename) { magic = getDWORD(); - if (magic == SAVE_MAGIC || magic == SAVE_MAGIC_2) { + if (magic == SAVE_MAGIC_3) { _savedVerMajor = _loadStream->readByte(); _savedVerMinor = _loadStream->readByte(); _savedExtMajor = _loadStream->readByte(); _savedExtMinor = _loadStream->readByte(); - if (magic == SAVE_MAGIC_2) { - _savedVerBuild = (byte)getDWORD(); - _savedName = getStringObj(); - - // load thumbnail - _thumbnailDataSize = getDWORD(); - if (_thumbnailDataSize > 0) { - _thumbnailData = new byte[_thumbnailDataSize]; - if (_thumbnailData) { - getBytes(_thumbnailData, _thumbnailDataSize); - } else { - _thumbnailDataSize = 0; - } - } - if (_savedVerMajor >= 1 && _savedVerMinor >= 2) { - _scummVMThumbSize = getDWORD(); - _scummVMThumbnailData = new byte[_scummVMThumbSize]; - if (_scummVMThumbnailData) { - getBytes(_scummVMThumbnailData, _scummVMThumbSize); - } else { - _scummVMThumbSize = 0; - } + _savedVerBuild = (byte)getDWORD(); + _savedName = getStringObj(); + + // load thumbnail + _thumbnailDataSize = getDWORD(); + if (_thumbnailDataSize > 0) { + _thumbnailData = new byte[_thumbnailDataSize]; + if (_thumbnailData) { + getBytes(_thumbnailData, _thumbnailDataSize); + } else { + _thumbnailDataSize = 0; } + } + + _scummVMThumbSize = getDWORD(); + _scummVMThumbnailData = new byte[_scummVMThumbSize]; + if (_scummVMThumbnailData) { + getBytes(_scummVMThumbnailData, _scummVMThumbSize); } else { - _savedVerBuild = 35; // last build with ver1 savegames + _scummVMThumbSize = 0; } uint32 dataOffset = getDWORD(); @@ -502,7 +489,7 @@ char *BasePersistenceManager::getString() { if (!strcmp(ret, "(null)")) { delete[] ret; - return NULL; + return nullptr; } else { return ret; } @@ -515,7 +502,7 @@ bool BasePersistenceManager::putTimeDate(const TimeDate &t) { _saveStream->writeSint32LE(t.tm_mday); _saveStream->writeSint32LE(t.tm_mon); _saveStream->writeSint32LE(t.tm_year); - // _saveStream->writeSint32LE(t.tm_wday); //TODO: Add this in when merging next + _saveStream->writeSint32LE(t.tm_wday); if (_saveStream->err()) { return STATUS_FAILED; @@ -531,20 +518,26 @@ TimeDate BasePersistenceManager::getTimeDate() { t.tm_mday = _loadStream->readSint32LE(); t.tm_mon = _loadStream->readSint32LE(); t.tm_year = _loadStream->readSint32LE(); - // t.tm_wday = _loadStream->readSint32LE(); //TODO: Add this in when merging next + t.tm_wday = _loadStream->readSint32LE(); return t; } void BasePersistenceManager::putFloat(float val) { - Common::String str = Common::String::format("F%f", val); + int32 exponent = 0; + float significand = frexp(val, &exponent); + Common::String str = Common::String::format("FS%f", significand); _saveStream->writeUint32LE(str.size()); _saveStream->writeString(str); + _saveStream->writeSint32LE(exponent); } float BasePersistenceManager::getFloat() { char *str = getString(); float value = 0.0f; - int ret = sscanf(str, "F%f", &value); + float significand = 0.0f; + int32 exponent = _loadStream->readSint32LE(); + int ret = sscanf(str, "FS%f", &significand); + value = ldexp(significand, exponent); if (ret != 1) { warning("%s not parsed as float", str); } @@ -553,16 +546,21 @@ float BasePersistenceManager::getFloat() { } void BasePersistenceManager::putDouble(double val) { - Common::String str = Common::String::format("D%f", val); - str.format("D%f", val); + int32 exponent = 0; + double significand = frexp(val, &exponent); + Common::String str = Common::String::format("DS%f", significand); _saveStream->writeUint32LE(str.size()); _saveStream->writeString(str); + _saveStream->writeSint32LE(exponent); } double BasePersistenceManager::getDouble() { char *str = getString(); - float value = 0.0f; // TODO: Do we ever really need to carry a full double-precision number? - int ret = sscanf(str, "D%f", &value); + double value = 0.0f; + float significand = 0.0f; + int32 exponent = _loadStream->readSint32LE(); + int ret = sscanf(str, "DS%f", &significand); + value = ldexp(significand, exponent); if (ret != 1) { warning("%s not parsed as double", str); } @@ -845,7 +843,7 @@ bool BasePersistenceManager::transfer(const char *name, void *val) { if (_saving) { SystemClassRegistry::getInstance()->getPointerID(*(void **)val, &classID, &instanceID); - if (*(void **)val != NULL && (classID == -1 || instanceID == -1)) { + if (*(void **)val != nullptr && (classID == -1 || instanceID == -1)) { debugC(kWintermuteDebugSaveGame, "Warning: invalid instance '%s'", name); } diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 114f6e066f..8cc21b353b 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -87,7 +87,7 @@ public: bool transfer(const char *name, Common::String *val); bool transfer(const char *name, Vector2 *val); bool transfer(const char *name, AnsiStringArray &Val); - BasePersistenceManager(const char *savePrefix = NULL, bool deleteSingleton = false); + BasePersistenceManager(const char *savePrefix = nullptr, bool deleteSingleton = false); virtual ~BasePersistenceManager(); bool checkVersion(byte verMajor, byte verMinor, byte verBuild); diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp index 0bc5975e51..a3a23f770a 100644 --- a/engines/wintermute/base/base_region.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -103,7 +103,7 @@ bool BaseRegion::pointInRegion(int x, int y) { ////////////////////////////////////////////////////////////////////////// bool BaseRegion::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "BaseRegion::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -289,7 +289,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta if (index >= 0 && index < (int32)_points.size()) { delete _points[index]; - _points[index] = NULL; + _points[index] = nullptr; _points.remove_at(index); createRegion(); diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h index 464f25be2f..6b7905fe53 100644 --- a/engines/wintermute/base/base_region.h +++ b/engines/wintermute/base/base_region.h @@ -51,7 +51,7 @@ public: bool loadBuffer(byte *buffer, bool complete = true); Rect32 _rect; BaseArray<BasePoint *> _points; - virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) { return saveAsText(buffer, indent, NULL); } + virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) { return saveAsText(buffer, indent, nullptr); } virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent, const char *nameOverride); // scripting interface diff --git a/engines/wintermute/base/base_save_thumb_helper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp index 3899ece59b..76d703a697 100644 --- a/engines/wintermute/base/base_save_thumb_helper.cpp +++ b/engines/wintermute/base/base_save_thumb_helper.cpp @@ -36,20 +36,20 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseSaveThumbHelper::BaseSaveThumbHelper(BaseGame *inGame) : BaseClass(inGame) { - _thumbnail = NULL; - _scummVMThumb = NULL; + _thumbnail = nullptr; + _scummVMThumb = nullptr; } ////////////////////////////////////////////////////////////////////////// BaseSaveThumbHelper::~BaseSaveThumbHelper(void) { delete _thumbnail; - _thumbnail = NULL; + _thumbnail = nullptr; delete _scummVMThumb; - _scummVMThumb = NULL; + _scummVMThumb = nullptr; } BaseImage *BaseSaveThumbHelper::storeThumb(bool doFlip, int width, int height) { - BaseImage *thumbnail = NULL; + BaseImage *thumbnail = nullptr; if (_gameRef->_thumbnailWidth > 0 && _gameRef->_thumbnailHeight > 0) { if (doFlip) { // when using opengl on windows it seems to be necessary to do this twice @@ -63,7 +63,7 @@ BaseImage *BaseSaveThumbHelper::storeThumb(bool doFlip, int width, int height) { BaseImage *screenshot = _gameRef->_renderer->takeScreenshot(); if (!screenshot) { - return NULL; + return nullptr; } // normal thumbnail @@ -74,7 +74,7 @@ BaseImage *BaseSaveThumbHelper::storeThumb(bool doFlip, int width, int height) { delete screenshot; - screenshot = NULL; + screenshot = nullptr; } return thumbnail; } @@ -82,7 +82,7 @@ BaseImage *BaseSaveThumbHelper::storeThumb(bool doFlip, int width, int height) { ////////////////////////////////////////////////////////////////////////// bool BaseSaveThumbHelper::storeThumbnail(bool doFlip) { delete _thumbnail; - _thumbnail = NULL; + _thumbnail = nullptr; if (_gameRef->_thumbnailWidth > 0 && _gameRef->_thumbnailHeight > 0) { @@ -98,7 +98,7 @@ bool BaseSaveThumbHelper::storeThumbnail(bool doFlip) { ////////////////////////////////////////////////////////////////////////// bool BaseSaveThumbHelper::storeScummVMThumbNail(bool doFlip) { delete _scummVMThumb; - _scummVMThumb = NULL; + _scummVMThumb = nullptr; _scummVMThumb = storeThumb(doFlip, kThumbnailWidth, kThumbnailHeight2); if (!_scummVMThumb) { diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp index abe5501b8d..d1a9d4aa46 100644 --- a/engines/wintermute/base/base_script_holder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -43,7 +43,7 @@ BaseScriptHolder::BaseScriptHolder(BaseGame *inGame) : BaseScriptable(inGame) { setName("<unnamed>"); _freezable = true; - _filename = NULL; + _filename = nullptr; } @@ -56,11 +56,11 @@ BaseScriptHolder::~BaseScriptHolder() { ////////////////////////////////////////////////////////////////////////// bool BaseScriptHolder::cleanup() { delete[] _filename; - _filename = NULL; + _filename = nullptr; for (uint32 i = 0; i < _scripts.size(); i++) { _scripts[i]->finish(true); - _scripts[i]->_owner = NULL; + _scripts[i]->_owner = nullptr; } _scripts.clear(); @@ -69,15 +69,15 @@ bool BaseScriptHolder::cleanup() { ////////////////////////////////////////////////////////////////////// void BaseScriptHolder::setFilename(const char *filename) { - if (_filename != NULL) { + if (_filename != nullptr) { delete[] _filename; - _filename = NULL; + _filename = nullptr; } - if (filename == NULL) { + if (filename == nullptr) { return; } _filename = new char [strlen(filename) + 1]; - if (_filename != NULL) { + if (_filename != nullptr) { strcpy(_filename, filename); } } @@ -388,8 +388,8 @@ bool BaseScriptHolder::parseProperty(byte *buffer, bool complete) { buffer = params; } - char *propName = NULL; - char *propValue = NULL; + char *propName = nullptr; + char *propValue = nullptr; while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { switch (cmd) { @@ -418,16 +418,16 @@ bool BaseScriptHolder::parseProperty(byte *buffer, bool complete) { if (cmd == PARSERR_TOKENNOTFOUND) { delete[] propName; delete[] propValue; - propName = NULL; - propValue = NULL; + propName = nullptr; + propValue = nullptr; _gameRef->LOG(0, "Syntax error in PROPERTY definition"); return STATUS_FAILED; } - if (cmd == PARSERR_GENERIC || propName == NULL || propValue == NULL) { + if (cmd == PARSERR_GENERIC || propName == nullptr || propValue == nullptr) { delete[] propName; delete[] propValue; - propName = NULL; - propValue = NULL; + propName = nullptr; + propValue = nullptr; _gameRef->LOG(0, "Error loading PROPERTY definition"); return STATUS_FAILED; } @@ -440,8 +440,8 @@ bool BaseScriptHolder::parseProperty(byte *buffer, bool complete) { delete val; delete[] propName; delete[] propValue; - propName = NULL; - propValue = NULL; + propName = nullptr; + propValue = nullptr; return STATUS_OK; } @@ -474,7 +474,7 @@ ScScript *BaseScriptHolder::invokeMethodThread(const char *methodName) { } } } - return NULL; + return nullptr; } diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp index 8c5ef7e45a..7dbcd72200 100644 --- a/engines/wintermute/base/base_scriptable.cpp +++ b/engines/wintermute/base/base_scriptable.cpp @@ -39,14 +39,14 @@ BaseScriptable::BaseScriptable(BaseGame *inGame, bool noValue, bool persistable) _refCount = 0; if (noValue) { - _scValue = NULL; + _scValue = nullptr; } else { _scValue = new ScValue(_gameRef); } _persistable = persistable; - _scProp = NULL; + _scProp = nullptr; } @@ -55,8 +55,8 @@ BaseScriptable::~BaseScriptable() { //if (_refCount>0) _gameRef->LOG(0, "Warning: Destroying object, _refCount=%d", _refCount); delete _scValue; delete _scProp; - _scValue = NULL; - _scProp = NULL; + _scValue = nullptr; + _scProp = nullptr; } @@ -83,7 +83,7 @@ ScValue *BaseScriptable::scGetProperty(const Common::String &name) { if (_scProp) { return _scProp->getProp(name.c_str()); // TODO: Change to Common::String } else { - return NULL; + return nullptr; } } @@ -185,7 +185,7 @@ bool BaseScriptable::canHandleMethod(const char *eventMethod) const { ////////////////////////////////////////////////////////////////////////// ScScript *BaseScriptable::invokeMethodThread(const char *methodName) { - return NULL; + return nullptr; } } // end of namespace Wintermute diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 468af1bd75..4f55e47c05 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -64,7 +64,7 @@ void BaseSprite::setDefaults() { _currentFrame = -1; _looping = false; _lastFrameTime = 0; - setFilename(NULL); + setFilename(nullptr); _finished = false; _changed = false; _paused = false; @@ -72,7 +72,7 @@ void BaseSprite::setDefaults() { _moveX = _moveY = 0; _editorMuted = false; - _editorBgFile = NULL; + _editorBgFile = nullptr; _editorBgOffsetX = _editorBgOffsetY = 0; _editorBgAlpha = 0xFF; _streamed = false; @@ -94,7 +94,7 @@ void BaseSprite::cleanup() { _frames.clear(); delete[] _editorBgFile; - _editorBgFile = NULL; + _editorBgFile = nullptr; setDefaults(); } @@ -141,7 +141,7 @@ bool BaseSprite::loadFile(const Common::String &filename, int lifeTime, TSpriteC } } else { BaseFileManager::getEngineInstance()->closeFile(file); - file = NULL; + file = nullptr; } bool ret = STATUS_FAILED; @@ -154,7 +154,7 @@ bool BaseSprite::loadFile(const Common::String &filename, int lifeTime, TSpriteC BaseFrame *frame = new BaseFrame(_gameRef); BaseSubFrame *subframe = new BaseSubFrame(_gameRef); subframe->setSurface(filename, true, 0, 0, 0, lifeTime, true); - if (subframe->_surface == NULL) { + if (subframe->_surface == nullptr) { _gameRef->LOG(0, "Error loading simple sprite '%s'", filename.c_str()); ret = STATUS_FAILED; delete frame; @@ -440,7 +440,7 @@ bool BaseSprite::display(int x, int y, BaseObject *registerVal, float zoomX, flo BaseSurface *BaseSprite::getSurface() { // only used for animated textures for 3D models if (_currentFrame < 0 || _currentFrame >= (int32)_frames.size()) { - return NULL; + return nullptr; } BaseFrame *frame = _frames[_currentFrame]; if (frame && frame->_subframes.size() > 0) { @@ -448,10 +448,10 @@ BaseSurface *BaseSprite::getSurface() { if (subframe) { return subframe->_surface; } else { - return NULL; + return nullptr; } } else { - return NULL; + return nullptr; } } @@ -611,13 +611,13 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta else if (strcmp(name, "AddFrame") == 0) { stack->correctParams(1); ScValue *val = stack->pop(); - const char *filename = NULL; + const char *filename = nullptr; if (!val->isNULL()) { filename = val->getString(); } BaseFrame *frame = new BaseFrame(_gameRef); - if (filename != NULL) { + if (filename != nullptr) { BaseSubFrame *sub = new BaseSubFrame(_gameRef); if (DID_SUCCEED(sub->setSurface(filename))) { sub->setDefaultRect(); @@ -643,13 +643,13 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta } ScValue *val = stack->pop(); - const char *filename = NULL; + const char *filename = nullptr; if (!val->isNULL()) { filename = val->getString(); } BaseFrame *frame = new BaseFrame(_gameRef); - if (filename != NULL) { + if (filename != nullptr) { BaseSubFrame *sub = new BaseSubFrame(_gameRef); if (DID_SUCCEED(sub->setSurface(filename))) { frame->_subframes.add(sub); @@ -740,7 +740,7 @@ ScValue *BaseSprite::scGetProperty(const Common::String &name) { // Owner (RO) ////////////////////////////////////////////////////////////////////////// else if (name == "Owner") { - if (_owner == NULL) { + if (_owner == nullptr) { _scValue->setNULL(); } else { _scValue->setNative(_owner, true); diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h index 1d244c3a52..ac1a0e919b 100644 --- a/engines/wintermute/base/base_sprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -47,18 +47,18 @@ public: bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100); int _moveY; int _moveX; - bool display(int x, int y, BaseObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); + bool display(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); bool getCurrentFrame(float zoomX = 100, float zoomY = 100); void reset(); bool isChanged(); bool isFinished(); bool loadBuffer(byte *buffer, bool compete = true, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL); bool loadFile(const Common::String &filename, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL); - bool draw(int x, int y, BaseObject *Register = NULL, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF); + bool draw(int x, int y, BaseObject *Register = nullptr, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF); bool _looping; int _currentFrame; - bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = NULL); - BaseSprite(BaseGame *inGame, BaseObject *owner = NULL); + bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = nullptr); + BaseSprite(BaseGame *inGame, BaseObject *owner = nullptr); virtual ~BaseSprite(); BaseArray<BaseFrame *> _frames; bool saveAsText(BaseDynamicBuffer *buffer, int indent); diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp index 2f890beea1..11ec7b094f 100644 --- a/engines/wintermute/base/base_string_table.cpp +++ b/engines/wintermute/base/base_string_table.cpp @@ -50,7 +50,7 @@ BaseStringTable::~BaseStringTable() { ////////////////////////////////////////////////////////////////////////// bool BaseStringTable::addString(const char *key, const char *val, bool reportDuplicities) { - if (key == NULL || val == NULL) { + if (key == nullptr || val == nullptr) { return STATUS_FAILED; } @@ -74,13 +74,13 @@ bool BaseStringTable::addString(const char *key, const char *val, bool reportDup ////////////////////////////////////////////////////////////////////////// char *BaseStringTable::getKey(const char *str) const { - if (str == NULL || str[0] != '/') { - return NULL; + if (str == nullptr || str[0] != '/') { + return nullptr; } const char *value = strchr(str + 1, '/'); - if (value == NULL) { - return NULL; + if (value == nullptr) { + return nullptr; } char *key = new char[value - str]; @@ -110,12 +110,12 @@ char *BaseStringTable::getKey(const char *str) const { ////////////////////////////////////////////////////////////////////////// void BaseStringTable::expand(char **str) const { - if (str == NULL || *str == NULL || *str[0] != '/') { + if (str == nullptr || *str == nullptr || *str[0] != '/') { return; } char *value = strchr(*str + 1, '/'); - if (value == NULL) { + if (value == nullptr) { return; } @@ -149,12 +149,12 @@ void BaseStringTable::expand(char **str) const { ////////////////////////////////////////////////////////////////////////// const char *BaseStringTable::expandStatic(const char *string) const { - if (string == NULL || string[0] == '\0' || string[0] != '/') { + if (string == nullptr || string[0] == '\0' || string[0] != '/') { return string; } const char *value = strchr(string + 1, '/'); - if (value == NULL) { + if (value == nullptr) { return string; } @@ -193,7 +193,7 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { uint32 size; byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename, &size); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "BaseStringTable::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -222,12 +222,12 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { char *line = new char[realLength + 1]; Common::strlcpy(line, (char *)&buffer[pos], realLength + 1); char *value = strchr(line, '\t'); - if (value == NULL) { + if (value == nullptr) { value = strchr(line, ' '); } if (line[0] != ';') { - if (value != NULL) { + if (value != nullptr) { value[0] = '\0'; value++; for (uint32 i = 0; i < strlen(value); i++) { diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 77cc522ae7..a06d7f50eb 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -44,7 +44,7 @@ IMPLEMENT_PERSISTENT(BaseSubFrame, false) ////////////////////////////////////////////////////////////////////////// BaseSubFrame::BaseSubFrame(BaseGame *inGame) : BaseScriptable(inGame, true) { - _surface = NULL; + _surface = nullptr; _hotspotX = _hotspotY = 0; _alpha = 0xFFFFFFFF; _transparent = 0xFFFF00FF; @@ -54,7 +54,7 @@ BaseSubFrame::BaseSubFrame(BaseGame *inGame) : BaseScriptable(inGame, true) { _editorSelected = false; - _surfaceFilename = NULL; + _surfaceFilename = nullptr; _cKDefault = true; _cKRed = _cKBlue = _cKGreen = 0; _lifeTime = -1; @@ -73,7 +73,7 @@ BaseSubFrame::~BaseSubFrame() { _gameRef->_surfaceStorage->removeSurface(_surface); } delete[] _surfaceFilename; - _surfaceFilename = NULL; + _surfaceFilename = nullptr; } @@ -118,10 +118,10 @@ bool BaseSubFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { int ar = 255, ag = 255, ab = 255, alpha = 255; bool custoTrans = false; BasePlatform::setRectEmpty(&rect); - char *surfaceFile = NULL; + char *surfaceFile = nullptr; delete _surface; - _surface = NULL; + _surface = nullptr; while ((cmd = parser.getCommand((char **)&buffer, commands, ¶ms)) > 0) { switch (cmd) { @@ -184,7 +184,7 @@ bool BaseSubFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { return STATUS_FAILED; } - if (surfaceFile != NULL) { + if (surfaceFile != nullptr) { if (custoTrans) { setSurface(surfaceFile, false, r, g, b, lifeTime, keepLoaded); } else { @@ -198,7 +198,7 @@ bool BaseSubFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { } /* - if (_surface == NULL) + if (_surface == nullptr) { _gameRef->LOG(0, "Error parsing sub-frame. Image not set."); return STATUS_FAILED; @@ -236,7 +236,7 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl return STATUS_OK; } - if (registerOwner != NULL && !_decoration) { + if (registerOwner != nullptr && !_decoration) { if (zoomX == 100 && zoomY == 100) { _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, registerOwner, this, x - _hotspotX + getRect().left, y - _hotspotY + getRect().top, getRect().right - getRect().left, getRect().bottom - getRect().top, zoomX, zoomY, precise)); } else { @@ -426,7 +426,7 @@ bool BaseSubFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS _gameRef->_surfaceStorage->removeSurface(_surface); } delete[] _surfaceFilename; - _surfaceFilename = NULL; + _surfaceFilename = nullptr; stack->pushBool(true); } else { const char *filename = val->getString(); @@ -617,11 +617,11 @@ const char *BaseSubFrame::scToString() { bool BaseSubFrame::setSurface(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) { if (_surface) { _gameRef->_surfaceStorage->removeSurface(_surface); - _surface = NULL; + _surface = nullptr; } delete[] _surfaceFilename; - _surfaceFilename = NULL; + _surfaceFilename = nullptr; _surface = _gameRef->_surfaceStorage->addSurface(filename, defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded); if (_surface) { @@ -645,7 +645,7 @@ bool BaseSubFrame::setSurface(const Common::String &filename, bool defaultCK, by ////////////////////////////////////////////////////////////////////////// bool BaseSubFrame::setSurfaceSimple() { if (!_surfaceFilename) { - _surface = NULL; + _surface = nullptr; return STATUS_OK; } _surface = _gameRef->_surfaceStorage->addSurface(_surfaceFilename, _cKDefault, _cKRed, _cKGreen, _cKBlue, _lifeTime, _keepLoaded); diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h index c173ae69d1..2888761bb3 100644 --- a/engines/wintermute/base/base_sub_frame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -52,7 +52,7 @@ public: BaseSubFrame(BaseGame *inGame); virtual ~BaseSubFrame(); bool loadBuffer(byte *buffer, int lifeTime, bool keepLoaded); - bool draw(int x, int y, BaseObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); + bool draw(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100); const char* getSurfaceFilename(); diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp index 2205e3e096..08d2d2f767 100644 --- a/engines/wintermute/base/base_surface_storage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -124,12 +124,12 @@ BaseSurface *BaseSurfaceStorage::addSurface(const Common::String &filename, bool surface = _gameRef->_renderer->createSurface(); if (!surface) { - return NULL; + return nullptr; } if (DID_FAIL(surface->create(filename, defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded))) { delete surface; - return NULL; + return nullptr; } else { surface->_referenceCount = 1; _surfaces.push_back(surface); diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp index b3c2cfa6c3..5a488b707f 100644 --- a/engines/wintermute/base/base_viewport.cpp +++ b/engines/wintermute/base/base_viewport.cpp @@ -38,7 +38,7 @@ IMPLEMENT_PERSISTENT(BaseViewport, false) ////////////////////////////////////////////////////////////////////////// BaseViewport::BaseViewport(BaseGame *inGame) : BaseClass(inGame) { BasePlatform::setRectEmpty(&_rect); - _mainObject = NULL; + _mainObject = nullptr; _offsetX = _offsetY = 0; } diff --git a/engines/wintermute/base/base_viewport.h b/engines/wintermute/base/base_viewport.h index 0182565a67..c69682da62 100644 --- a/engines/wintermute/base/base_viewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -44,7 +44,7 @@ public: int _offsetY; int _offsetX; BaseObject *_mainObject; - BaseViewport(BaseGame *inGame = NULL); + BaseViewport(BaseGame *inGame = nullptr); virtual ~BaseViewport(); private: Rect32 _rect; diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 25be3dad2d..3c1ecc7a73 100644 --- a/engines/wintermute/base/file/base_disk_file.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -39,10 +39,10 @@ namespace Wintermute { -void correctSlashes(char *fileName) { - for (size_t i = 0; i < strlen(fileName); i++) { +void correctSlashes(Common::String &fileName) { + for (size_t i = 0; i < fileName.size(); i++) { if (fileName[i] == '\\') { - fileName[i] = '/'; + fileName.setChar('/', i); } } } @@ -66,6 +66,12 @@ static Common::FSNode getNodeForRelativePath(const Common::String &filename) { const Common::FSNode gameDataDir(ConfMan.get("path")); Common::FSNode curNode = gameDataDir; + Common::String fixedPath = ""; + while (!path.empty()) { + fixedPath += path.nextToken() + "/"; + } + fixedPath.deleteLastChar(); + // Parse all path-elements while (!path.empty()) { // Get the next path-component by slicing on '\\' @@ -109,13 +115,14 @@ bool diskFileExists(const Common::String &filename) { Common::SeekableReadStream *openDiskFile(const Common::String &filename) { uint32 prefixSize = 0; - Common::SeekableReadStream *file = NULL; + Common::SeekableReadStream *file = nullptr; Common::String fixedFilename = filename; + correctSlashes(fixedFilename); // Absolute path: TODO: Add specific fallbacks here. - if (filename.contains(':')) { - if (filename.hasPrefix("c:\\windows\\fonts\\")) { // East Side Story refers to "c:\windows\fonts\framd.ttf" - fixedFilename = filename.c_str() + 17; + if (fixedFilename.contains(':')) { + if (fixedFilename.hasPrefix("c:/windows/fonts/")) { // East Side Story refers to "c:\windows\fonts\framd.ttf" + fixedFilename = filename.c_str() + 14; } else { error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str()); } @@ -125,7 +132,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { SearchMan.listMatchingMembers(files, fixedFilename); for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); ++it) { - if ((*it)->getName() == filename) { + if ((*it)->getName().equalsIgnoreCase(lastPathComponent(fixedFilename,'/'))) { file = (*it)->createReadStream(); break; } @@ -157,7 +164,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { if (!compBuffer) { error("Error allocating memory for compressed file '%s'", filename.c_str()); delete file; - return NULL; + return nullptr; } byte *data = new byte[uncompSize]; @@ -165,7 +172,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { error("Error allocating buffer for file '%s'", filename.c_str()); delete[] compBuffer; delete file; - return NULL; + return nullptr; } file->seek(dataOffset + prefixSize, SEEK_SET); file->read(compBuffer, compSize); @@ -174,7 +181,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { error("Error uncompressing file '%s'", filename.c_str()); delete[] compBuffer; delete file; - return NULL; + return nullptr; } delete[] compBuffer; @@ -188,7 +195,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { return file; } - return NULL; + return nullptr; } } // end of namespace Wintermute diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp index b9805d78dd..1968da6f47 100644 --- a/engines/wintermute/base/file/base_file_entry.cpp +++ b/engines/wintermute/base/file/base_file_entry.cpp @@ -37,7 +37,7 @@ namespace Wintermute { Common::SeekableReadStream *BaseFileEntry::createReadStream() const { Common::SeekableReadStream *file = _package->getFilePointer(); if (!file) { - return NULL; + return nullptr; } bool compressed = (_compressedLength != 0); @@ -55,7 +55,7 @@ Common::SeekableReadStream *BaseFileEntry::createReadStream() const { ////////////////////////////////////////////////////////////////////////// BaseFileEntry::BaseFileEntry() { - _package = NULL; + _package = nullptr; _length = _compressedLength = _offset = _flags = 0; _filename = ""; @@ -67,7 +67,7 @@ BaseFileEntry::BaseFileEntry() { ////////////////////////////////////////////////////////////////////////// BaseFileEntry::~BaseFileEntry() { - _package = NULL; // ref only + _package = nullptr; // ref only } } // end of namespace Wintermute diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp index 51a1558a7c..4434ed3951 100644 --- a/engines/wintermute/base/file/base_package.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -157,7 +157,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool pkg->_cd = stream->readByte(); pkg->_priority = hdr._priority; delete[] pkgName; - pkgName = NULL; + pkgName = nullptr; if (!hdr._masterIndex) { pkg->_cd = 0; // override CD to fixed disk @@ -186,7 +186,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool Common::String upcName = name; upcName.toUppercase(); delete[] name; - name = NULL; + name = nullptr; offset = stream->readUint32LE(); offset += absoluteOffset; @@ -270,7 +270,7 @@ Common::SeekableReadStream *PackageSet::createReadStreamForMember(const Common:: if (it != _files.end()) { return it->_value->createReadStream(); } - return NULL; + return nullptr; } } // end of namespace Wintermute diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp deleted file mode 100644 index 0b32cb0c4f..0000000000 --- a/engines/wintermute/base/file/base_resources.cpp +++ /dev/null @@ -1,2830 +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. - * - */ - -/* - * This file is based on WME Lite. - * http://dead-code.org/redir.php?target=wmelite - * Copyright (c) 2011 Jan Nedoma - */ - -#include "engines/wintermute/base/file/base_resources.h" -#include "common/str.h" -#include "common/memstream.h" - -namespace Wintermute { - -unsigned char invalid[] = { - 0x42, 0x4d, 0x36, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x04, 0x00, 0x00, 0x28, 0x00, - 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x4e, 0x00, 0x00, 0x20, 0x4e, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -} ; - -unsigned char invaliddebug[] = { - 0x42, 0x4d, 0x36, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x04, 0x00, 0x00, 0x28, 0x00, - 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, - 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, - 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x00, 0xc0, 0xdc, 0xc0, 0x00, 0xf0, 0xca, 0xa6, 0x00, 0x00, 0x20, - 0x40, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, 0x20, 0xa0, 0x00, 0x00, 0x20, - 0xc0, 0x00, 0x00, 0x20, 0xe0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x40, - 0x40, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0xa0, 0x00, 0x00, 0x40, - 0xc0, 0x00, 0x00, 0x40, 0xe0, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, - 0x40, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x80, 0x00, 0x00, 0x60, 0xa0, 0x00, 0x00, 0x60, - 0xc0, 0x00, 0x00, 0x60, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00, 0x80, - 0x40, 0x00, 0x00, 0x80, 0x60, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0xa0, 0x00, 0x00, 0x80, - 0xc0, 0x00, 0x00, 0x80, 0xe0, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0xa0, 0x20, 0x00, 0x00, 0xa0, - 0x40, 0x00, 0x00, 0xa0, 0x60, 0x00, 0x00, 0xa0, 0x80, 0x00, 0x00, 0xa0, 0xa0, 0x00, 0x00, 0xa0, - 0xc0, 0x00, 0x00, 0xa0, 0xe0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x00, 0x00, 0xc0, - 0x40, 0x00, 0x00, 0xc0, 0x60, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0xc0, 0xa0, 0x00, 0x00, 0xc0, - 0xc0, 0x00, 0x00, 0xc0, 0xe0, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0x20, 0x00, 0x00, 0xe0, - 0x40, 0x00, 0x00, 0xe0, 0x60, 0x00, 0x00, 0xe0, 0x80, 0x00, 0x00, 0xe0, 0xa0, 0x00, 0x00, 0xe0, - 0xc0, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x20, 0x00, 0x40, 0x00, - 0x40, 0x00, 0x40, 0x00, 0x60, 0x00, 0x40, 0x00, 0x80, 0x00, 0x40, 0x00, 0xa0, 0x00, 0x40, 0x00, - 0xc0, 0x00, 0x40, 0x00, 0xe0, 0x00, 0x40, 0x20, 0x00, 0x00, 0x40, 0x20, 0x20, 0x00, 0x40, 0x20, - 0x40, 0x00, 0x40, 0x20, 0x60, 0x00, 0x40, 0x20, 0x80, 0x00, 0x40, 0x20, 0xa0, 0x00, 0x40, 0x20, - 0xc0, 0x00, 0x40, 0x20, 0xe0, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x20, 0x00, 0x40, 0x40, - 0x40, 0x00, 0x40, 0x40, 0x60, 0x00, 0x40, 0x40, 0x80, 0x00, 0x40, 0x40, 0xa0, 0x00, 0x40, 0x40, - 0xc0, 0x00, 0x40, 0x40, 0xe0, 0x00, 0x40, 0x60, 0x00, 0x00, 0x40, 0x60, 0x20, 0x00, 0x40, 0x60, - 0x40, 0x00, 0x40, 0x60, 0x60, 0x00, 0x40, 0x60, 0x80, 0x00, 0x40, 0x60, 0xa0, 0x00, 0x40, 0x60, - 0xc0, 0x00, 0x40, 0x60, 0xe0, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x20, 0x00, 0x40, 0x80, - 0x40, 0x00, 0x40, 0x80, 0x60, 0x00, 0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0xa0, 0x00, 0x40, 0x80, - 0xc0, 0x00, 0x40, 0x80, 0xe0, 0x00, 0x40, 0xa0, 0x00, 0x00, 0x40, 0xa0, 0x20, 0x00, 0x40, 0xa0, - 0x40, 0x00, 0x40, 0xa0, 0x60, 0x00, 0x40, 0xa0, 0x80, 0x00, 0x40, 0xa0, 0xa0, 0x00, 0x40, 0xa0, - 0xc0, 0x00, 0x40, 0xa0, 0xe0, 0x00, 0x40, 0xc0, 0x00, 0x00, 0x40, 0xc0, 0x20, 0x00, 0x40, 0xc0, - 0x40, 0x00, 0x40, 0xc0, 0x60, 0x00, 0x40, 0xc0, 0x80, 0x00, 0x40, 0xc0, 0xa0, 0x00, 0x40, 0xc0, - 0xc0, 0x00, 0x40, 0xc0, 0xe0, 0x00, 0x40, 0xe0, 0x00, 0x00, 0x40, 0xe0, 0x20, 0x00, 0x40, 0xe0, - 0x40, 0x00, 0x40, 0xe0, 0x60, 0x00, 0x40, 0xe0, 0x80, 0x00, 0x40, 0xe0, 0xa0, 0x00, 0x40, 0xe0, - 0xc0, 0x00, 0x40, 0xe0, 0xe0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x20, 0x00, 0x80, 0x00, - 0x40, 0x00, 0x80, 0x00, 0x60, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xa0, 0x00, 0x80, 0x00, - 0xc0, 0x00, 0x80, 0x00, 0xe0, 0x00, 0x80, 0x20, 0x00, 0x00, 0x80, 0x20, 0x20, 0x00, 0x80, 0x20, - 0x40, 0x00, 0x80, 0x20, 0x60, 0x00, 0x80, 0x20, 0x80, 0x00, 0x80, 0x20, 0xa0, 0x00, 0x80, 0x20, - 0xc0, 0x00, 0x80, 0x20, 0xe0, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x80, 0x40, - 0x40, 0x00, 0x80, 0x40, 0x60, 0x00, 0x80, 0x40, 0x80, 0x00, 0x80, 0x40, 0xa0, 0x00, 0x80, 0x40, - 0xc0, 0x00, 0x80, 0x40, 0xe0, 0x00, 0x80, 0x60, 0x00, 0x00, 0x80, 0x60, 0x20, 0x00, 0x80, 0x60, - 0x40, 0x00, 0x80, 0x60, 0x60, 0x00, 0x80, 0x60, 0x80, 0x00, 0x80, 0x60, 0xa0, 0x00, 0x80, 0x60, - 0xc0, 0x00, 0x80, 0x60, 0xe0, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x20, 0x00, 0x80, 0x80, - 0x40, 0x00, 0x80, 0x80, 0x60, 0x00, 0x80, 0x80, 0x80, 0x00, 0x80, 0x80, 0xa0, 0x00, 0x80, 0x80, - 0xc0, 0x00, 0x80, 0x80, 0xe0, 0x00, 0x80, 0xa0, 0x00, 0x00, 0x80, 0xa0, 0x20, 0x00, 0x80, 0xa0, - 0x40, 0x00, 0x80, 0xa0, 0x60, 0x00, 0x80, 0xa0, 0x80, 0x00, 0x80, 0xa0, 0xa0, 0x00, 0x80, 0xa0, - 0xc0, 0x00, 0x80, 0xa0, 0xe0, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x00, 0x80, 0xc0, - 0x40, 0x00, 0x80, 0xc0, 0x60, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x80, 0xc0, 0xa0, 0x00, 0x80, 0xc0, - 0xc0, 0x00, 0x80, 0xc0, 0xe0, 0x00, 0x80, 0xe0, 0x00, 0x00, 0x80, 0xe0, 0x20, 0x00, 0x80, 0xe0, - 0x40, 0x00, 0x80, 0xe0, 0x60, 0x00, 0x80, 0xe0, 0x80, 0x00, 0x80, 0xe0, 0xa0, 0x00, 0x80, 0xe0, - 0xc0, 0x00, 0x80, 0xe0, 0xe0, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x20, 0x00, 0xc0, 0x00, - 0x40, 0x00, 0xc0, 0x00, 0x60, 0x00, 0xc0, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xa0, 0x00, 0xc0, 0x00, - 0xc0, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xc0, 0x20, 0x00, 0x00, 0xc0, 0x20, 0x20, 0x00, 0xc0, 0x20, - 0x40, 0x00, 0xc0, 0x20, 0x60, 0x00, 0xc0, 0x20, 0x80, 0x00, 0xc0, 0x20, 0xa0, 0x00, 0xc0, 0x20, - 0xc0, 0x00, 0xc0, 0x20, 0xe0, 0x00, 0xc0, 0x40, 0x00, 0x00, 0xc0, 0x40, 0x20, 0x00, 0xc0, 0x40, - 0x40, 0x00, 0xc0, 0x40, 0x60, 0x00, 0xc0, 0x40, 0x80, 0x00, 0xc0, 0x40, 0xa0, 0x00, 0xc0, 0x40, - 0xc0, 0x00, 0xc0, 0x40, 0xe0, 0x00, 0xc0, 0x60, 0x00, 0x00, 0xc0, 0x60, 0x20, 0x00, 0xc0, 0x60, - 0x40, 0x00, 0xc0, 0x60, 0x60, 0x00, 0xc0, 0x60, 0x80, 0x00, 0xc0, 0x60, 0xa0, 0x00, 0xc0, 0x60, - 0xc0, 0x00, 0xc0, 0x60, 0xe0, 0x00, 0xc0, 0x80, 0x00, 0x00, 0xc0, 0x80, 0x20, 0x00, 0xc0, 0x80, - 0x40, 0x00, 0xc0, 0x80, 0x60, 0x00, 0xc0, 0x80, 0x80, 0x00, 0xc0, 0x80, 0xa0, 0x00, 0xc0, 0x80, - 0xc0, 0x00, 0xc0, 0x80, 0xe0, 0x00, 0xc0, 0xa0, 0x00, 0x00, 0xc0, 0xa0, 0x20, 0x00, 0xc0, 0xa0, - 0x40, 0x00, 0xc0, 0xa0, 0x60, 0x00, 0xc0, 0xa0, 0x80, 0x00, 0xc0, 0xa0, 0xa0, 0x00, 0xc0, 0xa0, - 0xc0, 0x00, 0xc0, 0xa0, 0xe0, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0xc0, 0xc0, 0x20, 0x00, 0xc0, 0xc0, - 0x40, 0x00, 0xc0, 0xc0, 0x60, 0x00, 0xc0, 0xc0, 0x80, 0x00, 0xc0, 0xc0, 0xa0, 0x00, 0xf0, 0xfb, - 0xff, 0x00, 0xa4, 0xa0, 0xa0, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, - 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0xf9, - 0xf9, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0xf9, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0xf9, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, - 0xf9, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0xf9, 0x00, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0xf9, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, - 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9 -} ; - -unsigned char systemfont[] = { - 0x42, 0x4d, 0x36, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x04, 0x00, 0x00, 0x28, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x70, 0x0b, 0x00, 0x00, 0x70, 0x0b, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x80, 0x80, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, - 0x01, 0x02, 0x02, 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, - 0x02, 0x00, 0x01, 0x02, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0x01, 0x02, 0x00, 0x02, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, - 0x02, 0x01, 0x00, 0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x01, 0x02, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, - 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x00, 0x01, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x00, 0x01, 0x01, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, - 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, - 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x01, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x00, 0x01, 0x02, 0x00, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x01, - 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x01, 0x00, 0x02, 0x01, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x02, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, - 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 -} ; - -Common::SeekableReadStream *BaseResources::getFile(const Common::String &filename) { - if (scumm_stricmp(filename.c_str(), "invalid.bmp") == 0) { - return new Common::MemoryReadStream(invalid, sizeof(invalid), DisposeAfterUse::NO); - } else if (scumm_stricmp(filename.c_str(), "invalid_debug.bmp") == 0) { - return new Common::MemoryReadStream(invaliddebug, sizeof(invalid), DisposeAfterUse::NO); - } else if (scumm_stricmp(filename.c_str(), "syste_font.bmp") == 0) { - return new Common::MemoryReadStream(systemfont, sizeof(invalid), DisposeAfterUse::NO); - } - return NULL; -} - -bool BaseResources::hasFile(const Common::String &filename) { - if (scumm_stricmp(filename.c_str(), "invalid.bmp") == 0) { - return true; - } else if (scumm_stricmp(filename.c_str(), "invalid_debug.bmp") == 0) { - return true; - } else if (scumm_stricmp(filename.c_str(), "syste_font.bmp") == 0) { - return true; - } - return false; -} - -} // end of namespace Wintermute diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h deleted file mode 100644 index 91c30bcfa7..0000000000 --- a/engines/wintermute/base/file/base_resources.h +++ /dev/null @@ -1,45 +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. - * - */ - -/* - * This file is based on WME Lite. - * http://dead-code.org/redir.php?target=wmelite - * Copyright (c) 2011 Jan Nedoma - */ - -#ifndef WINTERMUTE_BASE_RESOURCES_H -#define WINTERMUTE_BASE_RESOURCES_H - -#include "common/stream.h" -#include "common/str.h" - -namespace Wintermute { - -class BaseResources { -public: - static Common::SeekableReadStream *getFile(const Common::String &filename); - static bool hasFile(const Common::String &filename); -}; - -} // end of namespace Wintermute - -#endif diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp index 94d3e5a94e..2c4ddf4875 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.cpp +++ b/engines/wintermute/base/file/base_save_thumb_file.cpp @@ -38,7 +38,7 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseSaveThumbFile::BaseSaveThumbFile() { - _data = NULL; + _data = nullptr; } @@ -99,7 +99,7 @@ bool BaseSaveThumbFile::open(const Common::String &filename) { ////////////////////////////////////////////////////////////////////////// bool BaseSaveThumbFile::close() { delete[] _data; - _data = NULL; + _data = nullptr; _pos = 0; _size = 0; diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp index 87dd3da5a3..e3c8827254 100644 --- a/engines/wintermute/base/font/base_font.cpp +++ b/engines/wintermute/base/font/base_font.cpp @@ -89,7 +89,7 @@ BaseFont *BaseFont::createFromFile(BaseGame *gameRef, const Common::String &file if (font) { if (DID_FAIL(font->loadFile(filename))) { delete font; - return NULL; + return nullptr; } } return font; @@ -98,7 +98,7 @@ BaseFont *BaseFont::createFromFile(BaseGame *gameRef, const Common::String &file if (font) { if (DID_FAIL(font->loadFile(filename))) { delete font; - return NULL; + return nullptr; } } return font; @@ -119,7 +119,7 @@ bool BaseFont::isTrueType(BaseGame *gameRef, const Common::String &filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { return false; } diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 55f46c476b..af66cbb89f 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -49,8 +49,8 @@ IMPLEMENT_PERSISTENT(BaseFontBitmap, false) ////////////////////////////////////////////////////////////////////// BaseFontBitmap::BaseFontBitmap(BaseGame *inGame) : BaseFont(inGame) { - _subframe = NULL; - _sprite = NULL; + _subframe = nullptr; + _sprite = nullptr; _widthsFrame = 0; memset(_widths, 0, NUM_CHARACTERS); _tileWidth = _tileHeight = _numColumns = 0; @@ -64,8 +64,8 @@ BaseFontBitmap::BaseFontBitmap(BaseGame *inGame) : BaseFont(inGame) { BaseFontBitmap::~BaseFontBitmap() { delete _subframe; delete _sprite; - _subframe = NULL; - _sprite = NULL; + _subframe = nullptr; + _sprite = nullptr; } @@ -112,7 +112,7 @@ int BaseFontBitmap::textHeightDraw(const byte *text, int x, int y, int width, TT return 0; } - if (text == NULL || text[0] == '\0') { + if (text == nullptr || text[0] == '\0') { return _tileHeight; } @@ -273,7 +273,7 @@ void BaseFontBitmap::drawChar(byte c, int x, int y) { ////////////////////////////////////////////////////////////////////// bool BaseFontBitmap::loadFile(const Common::String &filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "BaseFontBitmap::LoadFile failed for file '%s'", filename.c_str()); return STATUS_FAILED; } @@ -347,8 +347,8 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) { int i; int r = 255, g = 255, b = 255; bool custoTrans = false; - char *surfaceFile = NULL; - char *spriteFile = NULL; + char *surfaceFile = nullptr; + char *spriteFile = nullptr; bool autoWidth = false; int spaceWidth = 0; @@ -428,16 +428,16 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) { return STATUS_FAILED; } - if (spriteFile != NULL) { + if (spriteFile != nullptr) { delete _sprite; _sprite = new BaseSprite(_gameRef, this); if (!_sprite || DID_FAIL(_sprite->loadFile(spriteFile))) { delete _sprite; - _sprite = NULL; + _sprite = nullptr; } } - if (surfaceFile != NULL && !_sprite) { + if (surfaceFile != nullptr && !_sprite) { _subframe = new BaseSubFrame(_gameRef); if (custoTrans) { _subframe->setSurface(surfaceFile, false, r, g, b); @@ -447,7 +447,7 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) { } - if (((_subframe == NULL || _subframe->_surface == NULL) && _sprite == NULL) || _numColumns == 0 || _tileWidth == 0 || _tileHeight == 0) { + if (((_subframe == nullptr || _subframe->_surface == nullptr) && _sprite == nullptr) || _numColumns == 0 || _tileWidth == 0 || _tileHeight == 0) { _gameRef->LOG(0, "Incomplete font definition"); return STATUS_FAILED; } @@ -530,7 +530,7 @@ int BaseFontBitmap::getCharWidth(byte index) { ////////////////////////////////////////////////////////////////////////// bool BaseFontBitmap::getWidths() { - BaseSurface *surf = NULL; + BaseSurface *surf = nullptr; if (_sprite) { if (_widthsFrame >= 0 && _widthsFrame < (int32)_sprite->_frames.size()) { @@ -539,7 +539,7 @@ bool BaseFontBitmap::getWidths() { } } } - if (surf == NULL && _subframe) { + if (surf == nullptr && _subframe) { surf = _subframe->_surface; } if (!surf || DID_FAIL(surf->startPixelOp())) { diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index 8128ffe897..6a625f30ae 100644 --- a/engines/wintermute/base/font/base_font_storage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -72,7 +72,7 @@ bool BaseFontStorage::initLoop() { ////////////////////////////////////////////////////////////////////////// BaseFont *BaseFontStorage::addFont(const Common::String &filename) { if (!filename.size()) { - return NULL; + return nullptr; } for (uint32 i = 0; i < _fonts.size(); i++) { @@ -84,11 +84,11 @@ BaseFont *BaseFontStorage::addFont(const Common::String &filename) { /* BaseFont* font = new BaseFont(_gameRef); - if (!font) return NULL; + if (!font) return nullptr; if (DID_FAIL(font->loadFile(filename))) { delete font; - return NULL; + return nullptr; } else { font->_refCount = 1; diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 83f0a35f53..7f1ff340d2 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -50,13 +50,13 @@ BaseFontTT::BaseFontTT(BaseGame *inGame) : BaseFont(inGame) { _fontHeight = 12; _isBold = _isItalic = _isUnderline = _isStriked = false; - _fontFile = NULL; - _font = NULL; - _fallbackFont = NULL; - _deletableFont = NULL; + _fontFile = nullptr; + _font = nullptr; + _fallbackFont = nullptr; + _deletableFont = nullptr; for (int i = 0; i < NUM_CACHED_TEXTS; i++) { - _cachedTexts[i] = NULL; + _cachedTexts[i] = nullptr; } _lineHeight = 0; @@ -73,10 +73,10 @@ BaseFontTT::~BaseFontTT(void) { _layers.clear(); delete[] _fontFile; - _fontFile = NULL; + _fontFile = nullptr; delete _deletableFont; - _font = NULL; + _font = nullptr; } @@ -86,7 +86,7 @@ void BaseFontTT::clearCache() { if (_cachedTexts[i]) { delete _cachedTexts[i]; } - _cachedTexts[i] = NULL; + _cachedTexts[i] = nullptr; } } @@ -96,13 +96,13 @@ void BaseFontTT::initLoop() { if (_gameRef->_constrainedMemory) { // purge all cached images not used in the last frame for (int i = 0; i < NUM_CACHED_TEXTS; i++) { - if (_cachedTexts[i] == NULL) { + if (_cachedTexts[i] == nullptr) { continue; } if (!_cachedTexts[i]->_marked) { delete _cachedTexts[i]; - _cachedTexts[i] = NULL; + _cachedTexts[i] = nullptr; } else { _cachedTexts[i]->_marked = false; } @@ -151,7 +151,7 @@ int BaseFontTT::getTextHeight(byte *text, int width) { ////////////////////////////////////////////////////////////////////////// void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign align, int maxHeight, int maxLength) { - if (text == NULL || strcmp((const char *)text, "") == 0) { + if (text == nullptr || strcmp((const char *)text, "") == 0) { return; } @@ -176,11 +176,11 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign // find cached surface, if exists uint32 minUseTime = UINT_MAX; int minIndex = -1; - BaseSurface *surface = NULL; + BaseSurface *surface = nullptr; int textOffset = 0; for (int i = 0; i < NUM_CACHED_TEXTS; i++) { - if (_cachedTexts[i] == NULL) { + if (_cachedTexts[i] == nullptr) { minUseTime = 0; minIndex = i; } else { @@ -205,7 +205,7 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign surface = renderTextToTexture(textStr, width, align, maxHeight, textOffset); if (surface) { // write surface to cache - if (_cachedTexts[minIndex] != NULL) { + if (_cachedTexts[minIndex] != nullptr) { delete _cachedTexts[minIndex]; } _cachedTexts[minIndex] = new BaseCachedTTFontText; @@ -255,7 +255,7 @@ BaseSurface *BaseFontTT::renderTextToTexture(const WideString &text, int width, lines.pop_back(); } if (lines.size() == 0) { - return NULL; + return nullptr; } Graphics::TextAlign alignment = Graphics::kTextAlignInvalid; @@ -304,7 +304,7 @@ int BaseFontTT::getLetterHeight() { ////////////////////////////////////////////////////////////////////// bool BaseFontTT::loadFile(const Common::String &filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "BaseFontTT::LoadFile failed for file '%s'", filename.c_str()); return STATUS_FAILED; } @@ -422,7 +422,7 @@ bool BaseFontTT::loadBuffer(byte *buffer) { _layers.add(layer); } else { delete layer; - layer = NULL; + layer = nullptr; cmd = PARSERR_TOKENNOTFOUND; } } @@ -528,9 +528,9 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) { if (!persistMgr->getIsSaving()) { for (int i = 0; i < NUM_CACHED_TEXTS; i++) { - _cachedTexts[i] = NULL; + _cachedTexts[i] = nullptr; } - _fallbackFont = _font = _deletableFont = NULL; + _fallbackFont = _font = _deletableFont = nullptr; } return STATUS_OK; @@ -561,7 +561,7 @@ bool BaseFontTT::initFont() { _deletableFont = Graphics::loadTTFFont(*file, 96, _fontHeight); // Use the same dpi as WME (96 vs 72). _font = _deletableFont; BaseFileManager::getEngineInstance()->closeFile(file); - file = NULL; + file = nullptr; } // Fallback2: Try to find ScummModern.zip, and get the font from there: @@ -570,16 +570,16 @@ bool BaseFontTT::initFont() { if (themeFile) { Common::Archive *themeArchive = Common::makeZipArchive(themeFile); if (themeArchive->hasFile("FreeSans.ttf")) { - file = NULL; + file = nullptr; file = themeArchive->createReadStreamForMember("FreeSans.ttf"); _deletableFont = Graphics::loadTTFFont(*file, 96, _fontHeight); // Use the same dpi as WME (96 vs 72). _font = _deletableFont; } // We're not using BaseFileManager, so clean up after ourselves: delete file; - file = NULL; + file = nullptr; delete themeArchive; - themeArchive = NULL; + themeArchive = nullptr; } } @@ -627,7 +627,7 @@ void BaseFontTT::measureText(const WideString &text, int maxWidth, int maxHeight TextLine *line = (*it); textWidth = MAX(textWidth, line->GetWidth()); delete line; - line = NULL; + line = nullptr; }*/ } diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h index 2b69d1655d..ba4aac9380 100644 --- a/engines/wintermute/base/font/base_font_truetype.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -61,7 +61,7 @@ private: _text = ""; _width = _maxHeight = _maxLength = -1; _align = TAL_LEFT; - _surface = NULL; + _surface = nullptr; _textOffset = 0; _lastUsed = 0; _marked = false; diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index 4b15d563ed..75de95128f 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -43,10 +43,10 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////// BaseImage::BaseImage() { _fileManager = BaseFileManager::getEngineInstance(); - _palette = NULL; - _surface = NULL; - _decoder = NULL; - _deletableSurface = NULL; + _palette = nullptr; + _surface = nullptr; + _decoder = nullptr; + _deletableSurface = nullptr; } @@ -105,7 +105,7 @@ void BaseImage::copyFrom(const Graphics::Surface *surface) { } ////////////////////////////////////////////////////////////////////////// -bool BaseImage::saveBMPFile(const char *filename) const { +bool BaseImage::saveBMPFile(const Common::String &filename) const { warning("BaseImage::saveBMPFile - stubbed"); // TODO return false; } @@ -118,7 +118,7 @@ bool BaseImage::resize(int newWidth, int newHeight) { if (_deletableSurface) { _deletableSurface->free(); delete _deletableSurface; - _deletableSurface = NULL; + _deletableSurface = nullptr; } _surface = _deletableSurface = temp.scale((uint16)newWidth, (uint16)newHeight); temp.free(); @@ -222,7 +222,7 @@ bool BaseImage::copyFrom(BaseImage *origImage, int newWidth, int newHeight) { if (_deletableSurface) { _deletableSurface->free(); delete _deletableSurface; - _deletableSurface = NULL; + _deletableSurface = nullptr; } _surface = _deletableSurface = temp.scale((uint16)newWidth, (uint16)newHeight); return true; diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 6d01b84184..017305e5d0 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -55,7 +55,7 @@ public: byte getAlphaAt(int x, int y) const; bool writeBMPToStream(Common::WriteStream *stream) const; bool resize(int newWidth, int newHeight); - bool saveBMPFile(const char *filename) const; + bool saveBMPFile(const Common::String &filename) const; bool copyFrom(BaseImage *origImage, int newWidth = 0, int newHeight = 0); void copyFrom(const Graphics::Surface *surface); private: diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index e7ffc14c25..c20881e425 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -29,6 +29,7 @@ #include "engines/wintermute/base/base_active_rect.h" #include "engines/wintermute/base/gfx/base_renderer.h" #include "engines/wintermute/base/gfx/base_surface.h" +#include "engines/wintermute/base/gfx/base_image.h" #include "engines/wintermute/base/base_sub_frame.h" #include "engines/wintermute/base/base_region.h" #include "engines/wintermute/platform_osystem.h" @@ -56,7 +57,7 @@ BaseRenderer::BaseRenderer(BaseGame *inGame) : BaseClass(inGame) { _loadImageName = ""; _saveImageName = ""; - _saveLoadImage = NULL; + _saveLoadImage = nullptr; _loadInProgress = false; _hasDrawnSaveLoadImage = false; @@ -132,24 +133,24 @@ void BaseRenderer::initSaveLoad(bool isSaving, bool quickSave) { if (isSaving && !quickSave) { delete _saveLoadImage; - _saveLoadImage = NULL; + _saveLoadImage = nullptr; if (_saveImageName.size()) { _saveLoadImage = createSurface(); if (!_saveLoadImage || DID_FAIL(_saveLoadImage->create(_saveImageName, true, 0, 0, 0))) { delete _saveLoadImage; - _saveLoadImage = NULL; + _saveLoadImage = nullptr; } } } else { delete _saveLoadImage; - _saveLoadImage = NULL; + _saveLoadImage = nullptr; if (_loadImageName.size()) { _saveLoadImage = createSurface(); if (!_saveLoadImage || DID_FAIL(_saveLoadImage->create(_loadImageName, true, 0, 0, 0))) { delete _saveLoadImage; - _saveLoadImage = NULL; + _saveLoadImage = nullptr; } } _loadInProgress = true; @@ -162,7 +163,7 @@ void BaseRenderer::endSaveLoad() { _indicatorWidthDrawn = 0; delete _saveLoadImage; - _saveLoadImage = NULL; + _saveLoadImage = nullptr; } void BaseRenderer::persistSaveLoadImages(BasePersistenceManager *persistMgr) { @@ -214,7 +215,7 @@ BaseObject *BaseRenderer::getObjectAt(int x, int y) { } } - return (BaseObject *)NULL; + return (BaseObject *)nullptr; } @@ -317,7 +318,7 @@ bool BaseRenderer::clipCursor() { ////////////////////////////////////////////////////////////////////////// bool BaseRenderer::unclipCursor() { /* - if (!_windowed) ::ClipCursor(NULL); + if (!_windowed) ::ClipCursor(nullptr); */ return STATUS_OK; } @@ -344,6 +345,22 @@ void BaseRenderer::addRectToList(BaseActiveRect *rect) { _rectList.push_back(rect); } +bool BaseRenderer::saveScreenShot(const Common::String &filename, int sizeX, int sizeY) { + BaseImage *image = takeScreenshot(); + if (image) { + if (sizeX != 0 && sizeY != 0) { + if (!DID_SUCCEED(image->resize(sizeX, sizeY))) { + delete image; + return false; + } + } + image->saveBMPFile(filename); + delete image; + return true; + } + return false; +} + ////////////////////////////////////////////////////////////////////////// bool BaseRenderer::displayIndicator() { if (!_indicatorDisplay || !_indicatorProgress) { diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 796dee8cd1..5a24e0179a 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -61,6 +61,7 @@ public: * @return a BaseImage containing the current screen-buffer. */ virtual BaseImage *takeScreenshot() = 0; + virtual bool saveScreenShot(const Common::String &filename, int sizeX = 0, int sizeY = 0); virtual bool setViewport(int left, int top, int right, int bottom); virtual bool setViewport(Rect32 *rect); virtual Rect32 getViewPort() = 0; @@ -81,13 +82,13 @@ public: * @param g the green component to fade too. * @param b the blue component to fade too. * @param a the alpha component to fade too. - * @param rect the portion of the screen to fade (if NULL, the entire screen will be faded). + * @param rect the portion of the screen to fade (if nullptr, the entire screen will be faded). */ - virtual void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = NULL) = 0; + virtual void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = nullptr) = 0; virtual bool drawLine(int x1, int y1, int x2, int y2, uint32 color); // Unused outside indicator-display virtual bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1); // Unused outside indicator-display - BaseRenderer(BaseGame *inGame = NULL); + BaseRenderer(BaseGame *inGame = nullptr); virtual ~BaseRenderer(); virtual bool setProjection() { return STATUS_OK; @@ -101,7 +102,7 @@ public: * @param g the green component to fill with. * @param b the blue component to fill with. */ - virtual bool fill(byte r, byte g, byte b, Common::Rect *rect = NULL) = 0; + virtual bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) = 0; virtual void onWindowChange(); virtual bool initRenderer(int width, int height, bool windowed); /** diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 012be95aac..1ada900161 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -63,7 +63,7 @@ public: return STATUS_FAILED; } virtual bool putPixel(int x, int y, byte r, byte g, byte b, int a = -1); - virtual bool getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a = NULL); + virtual bool getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a = nullptr); virtual bool comparePixel(int x, int y, byte r, byte g, byte b, int a = -1); virtual bool startPixelOp(); virtual bool endPixelOp(); diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index a5b251cea6..061f52776e 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -54,13 +54,13 @@ BaseRenderOSystem::BaseRenderOSystem(BaseGame *inGame) : BaseRenderer(inGame) { _spriteBatch = false; _batchNum = 0; _skipThisFrame = false; - _previousTicket = NULL; + _previousTicket = nullptr; _borderLeft = _borderRight = _borderTop = _borderBottom = 0; _ratioX = _ratioY = 1.0f; setAlphaMod(255); setColorMod(255, 255, 255); - _dirtyRect = NULL; + _dirtyRect = nullptr; _disableDirtyRects = false; if (ConfMan.hasKey("dirty_rects")) { _disableDirtyRects = !ConfMan.getBool("dirty_rects"); @@ -169,7 +169,7 @@ bool BaseRenderOSystem::flip() { if (_skipThisFrame) { _skipThisFrame = false; delete _dirtyRect; - _dirtyRect = NULL; + _dirtyRect = nullptr; g_system->updateScreen(); _needsFlip = false; return true; @@ -196,7 +196,7 @@ bool BaseRenderOSystem::flip() { } // g_system->copyRectToScreen((byte *)_renderSurface->pixels, _renderSurface->pitch, _dirtyRect->left, _dirtyRect->top, _dirtyRect->width(), _dirtyRect->height()); delete _dirtyRect; - _dirtyRect = NULL; + _dirtyRect = nullptr; g_system->updateScreen(); _needsFlip = false; } @@ -262,7 +262,7 @@ void BaseRenderOSystem::fadeToColor(byte r, byte g, byte b, byte a, Common::Rect Common::Rect sizeRect(fillRect); sizeRect.translate(-fillRect.top, -fillRect.left); surf.fillRect(fillRect, col); - drawSurface(NULL, &surf, &sizeRect, &fillRect, false, false); + drawSurface(nullptr, &surf, &sizeRect, &fillRect, false, false); surf.free(); //SDL_SetRenderDrawColor(_renderer, r, g, b, a); @@ -287,7 +287,7 @@ void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::S } if (owner) { // Fade-tickets are owner-less - RenderTicket compare(owner, NULL, srcRect, dstRect, mirrorX, mirrorY, disableAlpha); + RenderTicket compare(owner, nullptr, srcRect, dstRect, mirrorX, mirrorY, disableAlpha); compare._batchNum = _batchNum; if (_spriteBatch) { _batchNum++; @@ -297,7 +297,7 @@ void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::S // Avoid calling end() and operator* every time, when potentially going through // LOTS of tickets. RenderQueueIterator endIterator = _renderQueue.end(); - RenderTicket *compareTicket = NULL; + RenderTicket *compareTicket = nullptr; for (it = _lastAddedTicket; it != endIterator; ++it) { compareTicket = *it; if (*(compareTicket) == compare && compareTicket->_isValid) { @@ -650,6 +650,10 @@ void BaseRenderOSystem::endSaveLoad() { // so just skip this single frame. _skipThisFrame = true; _drawNum = 1; + + _renderSurface->fillRect(Common::Rect(0, 0, _renderSurface->h, _renderSurface->w), _renderSurface->format.ARGBToColor(255, 0, 0, 0)); + g_system->copyRectToScreen((byte *)_renderSurface->pixels, _renderSurface->pitch, 0, 0, _renderSurface->w, _renderSurface->h); + g_system->updateScreen(); } bool BaseRenderOSystem::startSpriteBatch() { diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index 2c89037183..cc2ed57f9b 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -44,17 +44,17 @@ public: Common::String getName() const; - bool initRenderer(int width, int height, bool windowed); - bool flip(); + bool initRenderer(int width, int height, bool windowed) override; + bool flip() override; virtual bool indicatorFlip(); - bool fill(byte r, byte g, byte b, Common::Rect *rect = NULL); - Graphics::PixelFormat getPixelFormat() const; - void fade(uint16 alpha); - void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = NULL); + bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) override; + Graphics::PixelFormat getPixelFormat() const override; + void fade(uint16 alpha) override; + void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = nullptr) override; - bool drawLine(int x1, int y1, int x2, int y2, uint32 color); + bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override; - BaseImage *takeScreenshot(); + BaseImage *takeScreenshot() override; void setAlphaMod(byte alpha); void setColorMod(byte r, byte g, byte b); @@ -62,29 +62,29 @@ public: void invalidateTicketsFromSurface(BaseSurfaceOSystem *surf); void drawFromTicket(RenderTicket *renderTicket); - bool setViewport(int left, int top, int right, int bottom); - bool setViewport(Rect32 *rect) { return BaseRenderer::setViewport(rect); } - Rect32 getViewPort(); + bool setViewport(int left, int top, int right, int bottom) override; + bool setViewport(Rect32 *rect) override { return BaseRenderer::setViewport(rect); } + Rect32 getViewPort() override; void modTargetRect(Common::Rect *rect); - void pointFromScreen(Point32 *point); + void pointFromScreen(Point32 *point) ; void pointToScreen(Point32 *point); - void dumpData(const char *filename); + void dumpData(const char *filename) override; - float getScaleRatioX() const { + float getScaleRatioX() const override { return _ratioX; } - float getScaleRatioY() const { + float getScaleRatioY() const override { return _ratioY; } - virtual bool startSpriteBatch(); - virtual bool endSpriteBatch(); + virtual bool startSpriteBatch() override; + virtual bool endSpriteBatch() override; void endSaveLoad(); - void drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha = false); + void drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha = false) ; void repeatLastDraw(int offsetX, int offsetY, int numTimesX, int numTimesY); - BaseSurface *createSurface(); + BaseSurface *createSurface() override; private: - void addDirtyRect(const Common::Rect &rect); + void addDirtyRect(const Common::Rect &rect) ; void drawTickets(); // Non-dirty-rects: void drawFromSurface(RenderTicket *ticket); diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index e2bc3967e2..e3e4884fbb 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -47,9 +47,9 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseSurfaceOSystem::BaseSurfaceOSystem(BaseGame *inGame) : BaseSurface(inGame) { _surface = new Graphics::Surface(); - _alphaMask = NULL; + _alphaMask = nullptr; _hasAlpha = true; - _lockPixels = NULL; + _lockPixels = nullptr; _lockPitch = 0; _loaded = false; } @@ -59,11 +59,11 @@ BaseSurfaceOSystem::~BaseSurfaceOSystem() { if (_surface) { _surface->free(); delete _surface; - _surface = NULL; + _surface = nullptr; } delete[] _alphaMask; - _alphaMask = NULL; + _alphaMask = nullptr; _gameRef->addMem(-_width * _height * 4); BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer); @@ -140,23 +140,32 @@ bool BaseSurfaceOSystem::finishLoad() { // Well, actually, we don't convert via 24-bit as the color-key application overwrites the Alpha-channel anyhow. _surface->free(); delete _surface; + + bool needsColorKey = false; + bool replaceAlpha = true; if (_filename.hasSuffix(".bmp") && image->getSurface()->format.bytesPerPixel == 4) { _surface = image->getSurface()->convertTo(g_system->getScreenFormat(), image->getPalette()); - TransparentSurface trans(*_surface); - trans.applyColorKey(_ckRed, _ckGreen, _ckBlue); + needsColorKey = true; + replaceAlpha = false; } else if (image->getSurface()->format.bytesPerPixel == 1 && image->getPalette()) { _surface = image->getSurface()->convertTo(g_system->getScreenFormat(), image->getPalette()); - TransparentSurface trans(*_surface); - trans.applyColorKey(_ckRed, _ckGreen, _ckBlue, true); + needsColorKey = true; } else if (image->getSurface()->format.bytesPerPixel >= 3 && image->getSurface()->format != g_system->getScreenFormat()) { _surface = image->getSurface()->convertTo(g_system->getScreenFormat()); if (image->getSurface()->format.bytesPerPixel == 3) { - TransparentSurface trans(*_surface); - trans.applyColorKey(_ckRed, _ckGreen, _ckBlue, true); + needsColorKey = true; } } else { _surface = new Graphics::Surface(); _surface->copyFrom(*image->getSurface()); + if (_surface->format.aBits() == 0) { + needsColorKey = true; + } + } + + if (needsColorKey) { + TransparentSurface trans(*_surface); + trans.applyColorKey(_ckRed, _ckGreen, _ckBlue, replaceAlpha); } _hasAlpha = hasTransparency(_surface); @@ -177,7 +186,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) { return; // TODO: Reimplement this delete[] _alphaMask; - _alphaMask = NULL; + _alphaMask = nullptr; if (!surface) { return; } @@ -214,7 +223,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) { if (!hasTransparency) { delete[] _alphaMask; - _alphaMask = NULL; + _alphaMask = nullptr; } } @@ -293,7 +302,7 @@ bool BaseSurfaceOSystem::isTransparentAtLite(int x, int y) { ////////////////////////////////////////////////////////////////////////// bool BaseSurfaceOSystem::startPixelOp() { - //SDL_LockTexture(_texture, NULL, &_lockPixels, &_lockPitch); + //SDL_LockTexture(_texture, nullptr, &_lockPixels, &_lockPitch); // Any pixel-op makes the caching useless: BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer); renderer->invalidateTicketsFromSurface(this); diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h index 5bbfa27179..9091ec65b1 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h @@ -41,28 +41,28 @@ public: BaseSurfaceOSystem(BaseGame *inGame); ~BaseSurfaceOSystem(); - bool create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false); - bool create(int width, int height); + bool create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false) override; + bool create(int width, int height) override; - bool isTransparentAt(int x, int y); - bool isTransparentAtLite(int x, int y); + bool isTransparentAt(int x, int y) override; + bool isTransparentAtLite(int x, int y) override; - bool startPixelOp(); - bool endPixelOp(); + bool startPixelOp() override; + bool endPixelOp() override; - bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false); - bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false); - bool displayTransOffset(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0); - bool display(int x, int y, Rect32 rect, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false); - bool displayZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, bool transparent = false, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false); - bool displayTransform(int x, int y, int hotX, int hotY, Rect32 Rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false); - bool repeatLastDisplayOp(int offsetX, int offsetY, int numTimesX, int numTimesY); - virtual bool putSurface(const Graphics::Surface &surface, bool hasAlpha = false); + bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override; + bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override; + bool displayTransOffset(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) override; + bool display(int x, int y, Rect32 rect, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override; + bool displayZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, bool transparent = false, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override; + bool displayTransform(int x, int y, int hotX, int hotY, Rect32 Rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override; + bool repeatLastDisplayOp(int offsetX, int offsetY, int numTimesX, int numTimesY) override; + virtual bool putSurface(const Graphics::Surface &surface, bool hasAlpha = false) override; /* static unsigned DLL_CALLCONV ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle); static int DLL_CALLCONV SeekProc(fi_handle handle, long offset, int origin); static long DLL_CALLCONV TellProc(fi_handle handle);*/ - virtual int getWidth() { + virtual int getWidth() override { if (!_loaded) { finishLoad(); } @@ -71,7 +71,7 @@ public: } return _width; } - virtual int getHeight() { + virtual int getHeight() override { if (!_loaded) { finishLoad(); } diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.cpp b/engines/wintermute/base/gfx/osystem/render_ticket.cpp index 174f54e315..d253ddca4b 100644 --- a/engines/wintermute/base/gfx/osystem/render_ticket.cpp +++ b/engines/wintermute/base/gfx/osystem/render_ticket.cpp @@ -59,7 +59,7 @@ _srcRect(*srcRect), _dstRect(*dstRect), _drawNum(0), _isValid(true), _wantsDraw( _surface = temp; } } else { - _surface = NULL; + _surface = nullptr; } } diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index e1bc659fdd..1026969055 100644 --- a/engines/wintermute/base/particles/part_emitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -88,7 +88,7 @@ PartEmitter::PartEmitter(BaseGame *inGame, BaseScriptHolder *owner) : BaseObject _useRegion = false; - _emitEvent = NULL; + _emitEvent = nullptr; _owner = owner; } @@ -112,7 +112,7 @@ PartEmitter::~PartEmitter(void) { _sprites.clear(); delete[] _emitEvent; - _emitEvent = NULL; + _emitEvent = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -325,7 +325,7 @@ bool PartEmitter::display(BaseRegion *region) { } for (uint32 i = 0; i < _particles.size(); i++) { - if (region != NULL && _useRegion) { + if (region != nullptr && _useRegion) { if (!region->pointInRegion((int)_particles[i]->_pos.x, (int)_particles[i]->_pos.y)) { continue; } @@ -402,7 +402,7 @@ bool PartEmitter::setBorderThickness(int thicknessLeft, int thicknessRight, int ////////////////////////////////////////////////////////////////////////// PartForce *PartEmitter::addForceByName(const Common::String &name) { - PartForce *force = NULL; + PartForce *force = nullptr; for (uint32 i = 0; i < _forces.size(); i++) { if (scumm_stricmp(name.c_str(), _forces[i]->getName()) == 0) { @@ -1133,7 +1133,7 @@ bool PartEmitter::scSetProperty(const char *name, ScValue *value) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "EmitEvent") == 0) { delete[] _emitEvent; - _emitEvent = NULL; + _emitEvent = nullptr; if (!value->isNULL()) { BaseUtils::setString(&_emitEvent, value->getString()); } diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h index 3aa55e1ac8..54a49df230 100644 --- a/engines/wintermute/base/particles/part_emitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -48,7 +48,7 @@ public: bool start(); bool update(); - bool display() { return display(NULL); } // To avoid shadowing the inherited display-function. + bool display() { return display(nullptr); } // To avoid shadowing the inherited display-function. bool display(BaseRegion *region); bool sortParticlesByZ(); diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 0b850d9618..f1aba114de 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -41,7 +41,7 @@ PartParticle::PartParticle(BaseGame *inGame) : BaseClass(inGame) { _posZ = 0.0f; _velocity = Vector2(0.0f, 0.0f); _scale = 100.0f; - _sprite = NULL; + _sprite = nullptr; _creationTime = 0; _lifeTime = 0; _isDead = true; @@ -65,7 +65,7 @@ PartParticle::PartParticle(BaseGame *inGame) : BaseClass(inGame) { ////////////////////////////////////////////////////////////////////////// PartParticle::~PartParticle(void) { delete _sprite; - _sprite = NULL; + _sprite = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -76,7 +76,7 @@ bool PartParticle::setSprite(const Common::String &filename) { } delete _sprite; - _sprite = NULL; + _sprite = nullptr; SystemClassRegistry::getInstance()->_disabled = true; _sprite = new BaseSprite(_gameRef, (BaseObject*)_gameRef); @@ -85,7 +85,7 @@ bool PartParticle::setSprite(const Common::String &filename) { return STATUS_OK; } else { delete _sprite; - _sprite = NULL; + _sprite = nullptr; SystemClassRegistry::getInstance()->_disabled = false; return STATUS_FAILED; } @@ -199,7 +199,7 @@ bool PartParticle::display(PartEmitter *emitter) { _sprite->getCurrentFrame(); return _sprite->display((int)_pos.x, (int)_pos.y, - NULL, + nullptr, _scale, _scale, BYTETORGBA(255, 255, 255, _currentAlpha), _rotation, @@ -260,7 +260,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) { setSprite(filename); SystemClassRegistry::getInstance()->_disabled = false; delete[] filename; - filename = NULL; + filename = nullptr; } return STATUS_OK; diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp index 12204e1b35..465684a7a3 100644 --- a/engines/wintermute/base/saveload.cpp +++ b/engines/wintermute/base/saveload.cpp @@ -78,7 +78,7 @@ bool SaveLoad::loadGame(const Common::String &filename, BaseGame *gameRef) { //_gameRef->LOG(0, "Load end %d", BaseUtils::GetUsedMemMB()); // AdGame: if (DID_SUCCEED(ret)) { - SystemClassRegistry::getInstance()->enumInstances(SaveLoad::afterLoadRegion, "AdRegion", NULL); + SystemClassRegistry::getInstance()->enumInstances(SaveLoad::afterLoadRegion, "AdRegion", nullptr); } return ret; } @@ -114,13 +114,13 @@ bool SaveLoad::saveGame(int slot, const char *desc, bool quickSave, BaseGame *ga ////////////////////////////////////////////////////////////////////////// bool SaveLoad::initAfterLoad() { - SystemClassRegistry::getInstance()->enumInstances(afterLoadRegion, "BaseRegion", NULL); - SystemClassRegistry::getInstance()->enumInstances(afterLoadSubFrame, "BaseSubFrame", NULL); - SystemClassRegistry::getInstance()->enumInstances(afterLoadSound, "BaseSound", NULL); - SystemClassRegistry::getInstance()->enumInstances(afterLoadFont, "BaseFontTT", NULL); - SystemClassRegistry::getInstance()->enumInstances(afterLoadScript, "ScScript", NULL); + SystemClassRegistry::getInstance()->enumInstances(afterLoadRegion, "BaseRegion", nullptr); + SystemClassRegistry::getInstance()->enumInstances(afterLoadSubFrame, "BaseSubFrame", nullptr); + SystemClassRegistry::getInstance()->enumInstances(afterLoadSound, "BaseSound", nullptr); + SystemClassRegistry::getInstance()->enumInstances(afterLoadFont, "BaseFontTT", nullptr); + SystemClassRegistry::getInstance()->enumInstances(afterLoadScript, "ScScript", nullptr); // AdGame: - SystemClassRegistry::getInstance()->enumInstances(afterLoadScene, "AdScene", NULL); + SystemClassRegistry::getInstance()->enumInstances(afterLoadScene, "AdScene", nullptr); return STATUS_OK; } diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index 9bb7fedf38..23c452b73c 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -39,58 +39,58 @@ IMPLEMENT_PERSISTENT(ScScript, false) ////////////////////////////////////////////////////////////////////////// ScScript::ScScript(BaseGame *inGame, ScEngine *engine) : BaseClass(inGame) { - _buffer = NULL; + _buffer = nullptr; _bufferSize = _iP = 0; - _scriptStream = NULL; - _filename = NULL; + _scriptStream = nullptr; + _filename = nullptr; _currentLine = 0; - _symbols = NULL; + _symbols = nullptr; _numSymbols = 0; _engine = engine; - _globals = NULL; + _globals = nullptr; - _scopeStack = NULL; - _callStack = NULL; - _thisStack = NULL; - _stack = NULL; + _scopeStack = nullptr; + _callStack = nullptr; + _thisStack = nullptr; + _stack = nullptr; - _operand = NULL; - _reg1 = NULL; + _operand = nullptr; + _reg1 = nullptr; - _functions = NULL; + _functions = nullptr; _numFunctions = 0; - _methods = NULL; + _methods = nullptr; _numMethods = 0; - _events = NULL; + _events = nullptr; _numEvents = 0; - _externals = NULL; + _externals = nullptr; _numExternals = 0; _state = SCRIPT_FINISHED; _origState = SCRIPT_FINISHED; - _waitObject = NULL; + _waitObject = nullptr; _waitTime = 0; _waitFrozen = false; - _waitScript = NULL; + _waitScript = nullptr; _timeSlice = 0; _thread = false; _methodThread = false; - _threadEvent = NULL; + _threadEvent = nullptr; _freezable = true; - _owner = NULL; + _owner = nullptr; _unbreakable = false; - _parentScript = NULL; + _parentScript = nullptr; _tracingMode = false; } @@ -242,7 +242,7 @@ bool ScScript::create(const char *filename, byte *buffer, uint32 size, BaseScrip _methodThread = false; delete[] _threadEvent; - _threadEvent = NULL; + _threadEvent = nullptr; _filename = new char[strlen(filename) + 1]; if (_filename) { @@ -383,52 +383,52 @@ void ScScript::cleanup() { if (_buffer) { delete[] _buffer; } - _buffer = NULL; + _buffer = nullptr; if (_filename) { delete[] _filename; } - _filename = NULL; + _filename = nullptr; if (_symbols) { delete[] _symbols; } - _symbols = NULL; + _symbols = nullptr; _numSymbols = 0; if (_globals && !_thread) { delete _globals; } - _globals = NULL; + _globals = nullptr; delete _scopeStack; - _scopeStack = NULL; + _scopeStack = nullptr; delete _callStack; - _callStack = NULL; + _callStack = nullptr; delete _thisStack; - _thisStack = NULL; + _thisStack = nullptr; delete _stack; - _stack = NULL; + _stack = nullptr; if (_functions) { delete[] _functions; } - _functions = NULL; + _functions = nullptr; _numFunctions = 0; if (_methods) { delete[] _methods; } - _methods = NULL; + _methods = nullptr; _numMethods = 0; if (_events) { delete[] _events; } - _events = NULL; + _events = nullptr; _numEvents = 0; @@ -440,25 +440,25 @@ void ScScript::cleanup() { } delete[] _externals; } - _externals = NULL; + _externals = nullptr; _numExternals = 0; delete _operand; delete _reg1; - _operand = NULL; - _reg1 = NULL; + _operand = nullptr; + _reg1 = nullptr; delete[] _threadEvent; - _threadEvent = NULL; + _threadEvent = nullptr; _state = SCRIPT_FINISHED; - _waitObject = NULL; + _waitObject = nullptr; _waitTime = 0; _waitFrozen = false; - _waitScript = NULL; + _waitScript = nullptr; - _parentScript = NULL; // ref only + _parentScript = nullptr; // ref only delete _scriptStream; } @@ -511,7 +511,7 @@ bool ScScript::executeInstruction() { bool ret = STATUS_OK; uint32 dw; - const char *str = NULL; + const char *str = nullptr; //ScValue* op = new ScValue(_gameRef); _operand->cleanup(); @@ -787,7 +787,7 @@ bool ScScript::executeInstruction() { ScValue *var = _stack->pop(); ScValue *val = _stack->pop(); - if (val == NULL) { + if (val == nullptr) { runtimeError("Script stack corruption detected. Please report this script at WME bug reports forum."); var->setNULL(); } else { @@ -928,7 +928,7 @@ bool ScScript::executeInstruction() { case II_AND: op2 = _stack->pop(); op1 = _stack->pop(); - if (op1 == NULL || op2 == NULL) { + if (op1 == nullptr || op2 == nullptr) { runtimeError("Script corruption detected. Did you use '=' instead of '==' for comparison?"); _operand->setBool(false); } else { @@ -940,7 +940,7 @@ bool ScScript::executeInstruction() { case II_OR: op2 = _stack->pop(); op1 = _stack->pop(); - if (op1 == NULL || op2 == NULL) { + if (op1 == nullptr || op2 == nullptr) { runtimeError("Script corruption detected. Did you use '=' instead of '==' for comparison?"); _operand->setBool(false); } else { @@ -1120,7 +1120,7 @@ uint32 ScScript::getMethodPos(const Common::String &name) const { ////////////////////////////////////////////////////////////////////////// ScValue *ScScript::getVar(char *name) { - ScValue *ret = NULL; + ScValue *ret = nullptr; // scope locals if (_scopeStack->_sP >= 0) { @@ -1130,20 +1130,20 @@ ScValue *ScScript::getVar(char *name) { } // script globals - if (ret == NULL) { + if (ret == nullptr) { if (_globals->propExists(name)) { ret = _globals->getProp(name); } } // engine globals - if (ret == NULL) { + if (ret == nullptr) { if (_engine->_globals->propExists(name)) { ret = _engine->_globals->getProp(name); } } - if (ret == NULL) { + if (ret == nullptr) { //RuntimeError("Variable '%s' is inaccessible in the current block. Consider changing the script.", name); _gameRef->LOG(0, "Warning: variable '%s' is inaccessible in the current block. Consider changing the script (script:%s, line:%d)", name, _filename, _currentLine); ScValue *val = new ScValue(_gameRef); @@ -1263,8 +1263,8 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) { _scriptStream = new Common::MemoryReadStream(_buffer, _bufferSize); initTables(); } else { - _buffer = NULL; - _scriptStream = NULL; + _buffer = nullptr; + _scriptStream = nullptr; } } @@ -1306,11 +1306,11 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) { ////////////////////////////////////////////////////////////////////////// ScScript *ScScript::invokeEventHandler(const Common::String &eventName, bool unbreakable) { - //if (_state!=SCRIPT_PERSISTENT) return NULL; + //if (_state!=SCRIPT_PERSISTENT) return nullptr; uint32 pos = getEventPos(eventName); if (!pos) { - return NULL; + return nullptr; } ScScript *thread = new ScScript(_gameRef, _engine); @@ -1322,10 +1322,10 @@ ScScript *ScScript::invokeEventHandler(const Common::String &eventName, bool unb return thread; } else { delete thread; - return NULL; + return nullptr; } } else { - return NULL; + return nullptr; } } @@ -1390,7 +1390,7 @@ ScScript::TExternalFunction *ScScript::getExternal(char *name) { return &_externals[i]; } } - return NULL; + return nullptr; } @@ -1446,7 +1446,7 @@ const char *ScScript::dbgGetFilename() { ////////////////////////////////////////////////////////////////////////// void ScScript::afterLoad() { - if (_buffer == NULL) { + if (_buffer == nullptr) { byte *buffer = _engine->getCompiledScript(_filename, &_bufferSize); if (!buffer) { _gameRef->LOG(0, "Error reinitializing script '%s' after load. Script will be terminated.", _filename); diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index e8be0f0bd5..d5c5797a39 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -69,10 +69,10 @@ ScEngine::ScEngine(BaseGame *inGame) : BaseClass(inGame) { // prepare script cache for (int i = 0; i < MAX_CACHED_SCRIPTS; i++) { - _cachedScripts[i] = NULL; + _cachedScripts[i] = nullptr; } - _currentScript = NULL; + _currentScript = nullptr; _isProfiling = false; _profilingStartTime = 0; @@ -105,11 +105,11 @@ bool ScEngine::cleanup() { _scripts.clear(); delete _globals; - _globals = NULL; + _globals = nullptr; emptyScriptCache(); - _currentScript = NULL; // ref only + _currentScript = nullptr; // ref only return STATUS_OK; } @@ -140,7 +140,7 @@ ScScript *ScEngine::runScript(const char *filename, BaseScriptHolder *owner) { // get script from cache compBuffer = getCompiledScript(filename, &compSize); if (!compBuffer) { - return NULL; + return nullptr; } // add new script @@ -149,7 +149,7 @@ ScScript *ScEngine::runScript(const char *filename, BaseScriptHolder *owner) { if (DID_FAIL(ret)) { _gameRef->LOG(ret, "Error running script '%s'...", filename); delete script; - return NULL; + return nullptr; } else { // publish the "self" pseudo-variable ScValue val(_gameRef); @@ -191,7 +191,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig byte *buffer = BaseEngine::instance().getFileManager()->readWholeFile(filename, &size); if (!buffer) { _gameRef->LOG(0, "ScEngine::GetCompiledScript - error opening script '%s'", filename); - return NULL; + return nullptr; } // needs to be compiled? @@ -202,14 +202,14 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig if (!_compilerAvailable) { _gameRef->LOG(0, "ScEngine::GetCompiledScript - script '%s' needs to be compiled but compiler is not available", filename); delete[] buffer; - return NULL; + return nullptr; } // This code will never be called, since _compilerAvailable is const false. // It's only here in the event someone would want to reinclude the compiler. error("Script needs compilation, ScummVM does not contain a WME compiler"); } - byte *ret = NULL; + byte *ret = nullptr; // add script to cache CScCachedScript *cachedScript = new CScCachedScript(filename, compBuffer, compSize); @@ -217,7 +217,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig int index = 0; uint32 minTime = g_system->getMillis(); for (int i = 0; i < MAX_CACHED_SCRIPTS; i++) { - if (_cachedScripts[i] == NULL) { + if (_cachedScripts[i] == nullptr) { index = i; break; } else if (_cachedScripts[i]->_timestamp <= minTime) { @@ -226,7 +226,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig } } - if (_cachedScripts[index] != NULL) { + if (_cachedScripts[index] != nullptr) { delete _cachedScripts[index]; } _cachedScripts[index] = cachedScript; @@ -296,7 +296,7 @@ bool ScEngine::tick() { if (!isValidScript(_scripts[i]->_waitScript) || _scripts[i]->_waitScript->_state == SCRIPT_ERROR) { // fake return value _scripts[i]->_stack->pushNULL(); - _scripts[i]->_waitScript = NULL; + _scripts[i]->_waitScript = nullptr; _scripts[i]->run(); } else { if (_scripts[i]->_waitScript->_state == SCRIPT_THREAD_FINISHED) { @@ -304,7 +304,7 @@ bool ScEngine::tick() { _scripts[i]->_stack->push(_scripts[i]->_waitScript->_stack->pop()); _scripts[i]->run(); _scripts[i]->_waitScript->finish(); - _scripts[i]->_waitScript = NULL; + _scripts[i]->_waitScript = nullptr; } } break; @@ -351,7 +351,7 @@ bool ScEngine::tick() { addScriptTime(_scripts[i]->_filename, g_system->getMillis() - startTime); } } - _currentScript = NULL; + _currentScript = nullptr; } removeFinishedScripts(); @@ -373,7 +373,7 @@ bool ScEngine::tickUnbreakable() { _scripts[i]->executeInstruction(); } _scripts[i]->finish(); - _currentScript = NULL; + _currentScript = nullptr; } removeFinishedScripts(); @@ -444,7 +444,7 @@ bool ScEngine::emptyScriptCache() { for (int i = 0; i < MAX_CACHED_SCRIPTS; i++) { if (_cachedScripts[i]) { delete _cachedScripts[i]; - _cachedScripts[i] = NULL; + _cachedScripts[i] = nullptr; } } return STATUS_OK; @@ -496,7 +496,7 @@ bool ScEngine::persist(BasePersistenceManager *persistMgr) { ////////////////////////////////////////////////////////////////////////// void ScEngine::editorCleanup() { for (uint32 i = 0; i < _scripts.size(); i++) { - if (_scripts[i]->_owner == NULL && (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR)) { + if (_scripts[i]->_owner == nullptr && (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR)) { delete _scripts[i]; _scripts.remove_at(i); i--; diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h index 1a023326eb..639875ffb6 100644 --- a/engines/wintermute/base/scriptables/script_engine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -96,10 +96,10 @@ public: byte *getCompiledScript(const char *filename, uint32 *outSize, bool ignoreCache = false); DECLARE_PERSISTENT(ScEngine, BaseClass) bool cleanup(); - int getNumScripts(int *running = NULL, int *waiting = NULL, int *persistent = NULL); + int getNumScripts(int *running = nullptr, int *waiting = nullptr, int *persistent = nullptr); bool tick(); ScValue *_globals; - ScScript *runScript(const char *filename, BaseScriptHolder *owner = NULL); + ScScript *runScript(const char *filename, BaseScriptHolder *owner = nullptr); static const bool _compilerAvailable = false; ScEngine(BaseGame *inGame); diff --git a/engines/wintermute/base/scriptables/script_ext_array.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp index 613cbd0758..892d0674ff 100644 --- a/engines/wintermute/base/scriptables/script_ext_array.cpp +++ b/engines/wintermute/base/scriptables/script_ext_array.cpp @@ -69,7 +69,7 @@ SXArray::SXArray(BaseGame *inGame) : BaseScriptable(inGame) { ////////////////////////////////////////////////////////////////////////// SXArray::~SXArray() { delete _values; - _values = NULL; + _values = nullptr; } diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 08ecc8d7db..29e032a759 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -52,13 +52,13 @@ SXFile::SXFile(BaseGame *inGame, ScStack *stack) : BaseScriptable(inGame) { stack->correctParams(1); ScValue *val = stack->pop(); - _filename = NULL; + _filename = nullptr; if (!val->isNULL()) { BaseUtils::setString(&_filename, val->getString()); } - _readFile = NULL; - _writeFile = NULL; + _readFile = nullptr; + _writeFile = nullptr; _mode = 0; _textMode = false; @@ -73,7 +73,7 @@ SXFile::~SXFile() { ////////////////////////////////////////////////////////////////////////// void SXFile::cleanup() { delete[] _filename; - _filename = NULL; + _filename = nullptr; close(); } @@ -82,12 +82,12 @@ void SXFile::cleanup() { void SXFile::close() { if (_readFile) { BaseFileManager::getEngineInstance()->closeFile(_readFile); - _readFile = NULL; + _readFile = nullptr; } if (_writeFile) { _writeFile->finalize(); delete _writeFile; - _writeFile = NULL; + _writeFile = nullptr; } _mode = 0; _textMode = false; @@ -778,8 +778,8 @@ bool SXFile::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(pos)); // try to re-open file if needed - _writeFile = NULL; - _readFile = NULL; + _writeFile = nullptr; + _readFile = nullptr; if (_mode != 0) { // open for reading diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 42c5cfb20e..9de9905fea 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -44,7 +44,7 @@ BaseScriptable *makeSXMemBuffer(BaseGame *inGame, ScStack *stack) { ////////////////////////////////////////////////////////////////////////// SXMemBuffer::SXMemBuffer(BaseGame *inGame, ScStack *stack) : BaseScriptable(inGame) { stack->correctParams(1); - _buffer = NULL; + _buffer = nullptr; _size = 0; int newSize = stack->pop()->getInt(); @@ -73,7 +73,7 @@ void SXMemBuffer::cleanup() { if (_size) { free(_buffer); } - _buffer = NULL; + _buffer = nullptr; _size = 0; } @@ -109,7 +109,7 @@ bool SXMemBuffer::resize(int newSize) { ////////////////////////////////////////////////////////////////////////// bool SXMemBuffer::checkBounds(ScScript *script, int start, int length) { - if (_buffer == NULL) { + if (_buffer == nullptr) { script->runtimeError("Cannot use Set/Get methods on an uninitialized memory buffer"); return false; } @@ -509,7 +509,7 @@ bool SXMemBuffer::persist(BasePersistenceManager *persistMgr) { _buffer = malloc(_size); persistMgr->getBytes((byte *)_buffer, _size); } else { - _buffer = NULL; + _buffer = nullptr; } } diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index 5f7da1c2dd..6b4a615509 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -45,7 +45,7 @@ BaseScriptable *makeSXString(BaseGame *inGame, ScStack *stack) { ////////////////////////////////////////////////////////////////////////// SXString::SXString(BaseGame *inGame, ScStack *stack) : BaseScriptable(inGame) { - _string = NULL; + _string = nullptr; _capacity = 0; stack->correctParams(1); @@ -81,7 +81,7 @@ void SXString::setStringVal(const char *val) { if (len >= _capacity) { _capacity = len + 1; delete[] _string; - _string = NULL; + _string = nullptr; _string = new char[_capacity]; memset(_string, 0, _capacity); } @@ -331,7 +331,7 @@ bool SXString::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack array->push(val); delete val; - val = NULL; + val = nullptr; } stack->pushNative(array, false); @@ -420,7 +420,7 @@ bool SXString::persist(BasePersistenceManager *persistMgr) { _string = new char[_capacity]; persistMgr->getBytes((byte *)_string, _capacity); } else { - _string = NULL; + _string = nullptr; } } diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 194c5f4f35..3239decae8 100644 --- a/engines/wintermute/base/scriptables/script_stack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -58,7 +58,7 @@ ScStack::~ScStack() { ScValue *ScStack::pop() { if (_sP < 0) { _gameRef->LOG(0, "Fatal: Stack underflow"); - return NULL; + return nullptr; } return _values[_sP--]; @@ -97,7 +97,7 @@ ScValue *ScStack::getPushValue() { ////////////////////////////////////////////////////////////////////////// ScValue *ScStack::getTop() { if (_sP < 0 || _sP >= (int32)_values.size()) { - return NULL; + return nullptr; } else { return _values[_sP]; } @@ -108,7 +108,7 @@ ScValue *ScStack::getTop() { ScValue *ScStack::getAt(int index) { index = _sP - index; if (index < 0 || index >= (int32)_values.size()) { - return NULL; + return nullptr; } else { return _values[index]; } diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index ad8ab26e09..46d6c25d44 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -49,9 +49,9 @@ ScValue::ScValue(BaseGame *inGame) : BaseClass(inGame) { _valBool = false; _valInt = 0; _valFloat = 0.0f; - _valNative = NULL; - _valString = NULL; - _valRef = NULL; + _valNative = nullptr; + _valString = nullptr; + _valRef = nullptr; _persistent = false; _isConstVar = false; } @@ -64,9 +64,9 @@ ScValue::ScValue(BaseGame *inGame, bool val) : BaseClass(inGame) { _valInt = 0; _valFloat = 0.0f; - _valNative = NULL; - _valString = NULL; - _valRef = NULL; + _valNative = nullptr; + _valString = nullptr; + _valRef = nullptr; _persistent = false; _isConstVar = false; } @@ -79,9 +79,9 @@ ScValue::ScValue(BaseGame *inGame, int val) : BaseClass(inGame) { _valFloat = 0.0f; _valBool = false; - _valNative = NULL; - _valString = NULL; - _valRef = NULL; + _valNative = nullptr; + _valString = nullptr; + _valRef = nullptr; _persistent = false; _isConstVar = false; } @@ -94,9 +94,9 @@ ScValue::ScValue(BaseGame *inGame, double val) : BaseClass(inGame) { _valInt = 0; _valBool = false; - _valNative = NULL; - _valString = NULL; - _valRef = NULL; + _valNative = nullptr; + _valString = nullptr; + _valRef = nullptr; _persistent = false; _isConstVar = false; } @@ -105,14 +105,14 @@ ScValue::ScValue(BaseGame *inGame, double val) : BaseClass(inGame) { ////////////////////////////////////////////////////////////////////////// ScValue::ScValue(BaseGame *inGame, const char *val) : BaseClass(inGame) { _type = VAL_STRING; - _valString = NULL; + _valString = nullptr; setStringVal(val); _valBool = false; _valInt = 0; _valFloat = 0.0f; - _valNative = NULL; - _valRef = NULL; + _valNative = nullptr; + _valRef = nullptr; _persistent = false; _isConstVar = false; } @@ -131,7 +131,7 @@ void ScValue::cleanup(bool ignoreNatives) { _valNative->_refCount--; if (_valNative->_refCount <= 0) { delete _valNative; - _valNative = NULL; + _valNative = nullptr; } } } @@ -142,9 +142,9 @@ void ScValue::cleanup(bool ignoreNatives) { _valBool = false; _valInt = 0; _valFloat = 0.0f; - _valNative = NULL; - _valString = NULL; - _valRef = NULL; + _valNative = nullptr; + _valString = nullptr; + _valRef = nullptr; _persistent = false; _isConstVar = false; } @@ -176,13 +176,13 @@ ScValue *ScValue::getProp(const char *name) { return _gameRef->_scValue; } - ScValue *ret = NULL; + ScValue *ret = nullptr; if (_type == VAL_NATIVE && _valNative) { ret = _valNative->scGetProperty(name); } - if (ret == NULL) { + if (ret == nullptr) { _valIter = _valObject.find(name); if (_valIter != _valObject.end()) { ret = _valIter->_value; @@ -200,7 +200,7 @@ bool ScValue::deleteProp(const char *name) { _valIter = _valObject.find(name); if (_valIter != _valObject.end()) { delete _valIter->_value; - _valIter->_value = NULL; + _valIter->_value = nullptr; } return STATUS_OK; @@ -220,7 +220,7 @@ bool ScValue::setProp(const char *name, ScValue *val, bool copyWhole, bool setAs } if (DID_FAIL(ret)) { - ScValue *newVal = NULL; + ScValue *newVal = nullptr; _valIter = _valObject.find(name); if (_valIter != _valObject.end()) { @@ -244,7 +244,7 @@ bool ScValue::setProp(const char *name, ScValue *val, bool copyWhole, bool setAs _valIter = _valObject.find(Name); if (_valIter != _valObject.end()) { delete _valIter->_value; - _valIter->_value = NULL; + _valIter->_value = nullptr; } ScValue* val = new ScValue(_gameRef); val->Copy(Val, CopyWhole); @@ -451,11 +451,11 @@ void ScValue::setString(const Common::String &val) { void ScValue::setStringVal(const char *val) { if (_valString) { delete[] _valString; - _valString = NULL; + _valString = nullptr; } - if (val == NULL) { - _valString = NULL; + if (val == nullptr) { + _valString = nullptr; return; } @@ -479,7 +479,7 @@ void ScValue::setNULL() { delete _valNative; } } - _valNative = NULL; + _valNative = nullptr; deleteProps(); _type = VAL_NULL; @@ -493,7 +493,7 @@ void ScValue::setNative(BaseScriptable *val, bool persistent) { return; } - if (val == NULL) { + if (val == nullptr) { setNULL(); } else { if (_valNative && !_persistent) { @@ -502,7 +502,7 @@ void ScValue::setNative(BaseScriptable *val, bool persistent) { if (_valNative != val) { delete _valNative; } - _valNative = NULL; + _valNative = nullptr; } } @@ -693,7 +693,7 @@ BaseScriptable *ScValue::getNative() { if (_type == VAL_NATIVE) { return _valNative; } else { - return NULL; + return nullptr; } } @@ -714,7 +714,7 @@ void ScValue::copy(ScValue *orig, bool copyWhole) { if (_valNative != orig->_valNative) { delete _valNative; } - _valNative = NULL; + _valNative = nullptr; } } @@ -827,7 +827,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_valRef)); persistMgr->transfer(TMEMBER(_valString)); - /* + /* // TODO: Convert to Debug-statements. FILE* f = fopen("c:\\val.log", "a+"); switch(_type) { diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 00d07cd3c2..f246c03fe1 100644 --- a/engines/wintermute/base/sound/base_sound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -36,7 +36,7 @@ namespace Wintermute { IMPLEMENT_PERSISTENT(BaseSound, false) BaseSound::BaseSound(BaseGame *inGame) : BaseClass(inGame) { - _sound = NULL; + _sound = nullptr; _soundFilename = ""; _soundType = Audio::Mixer::kSFXSoundType; @@ -57,13 +57,13 @@ BaseSound::~BaseSound() { if (_sound) { _gameRef->_soundMgr->removeSound(_sound); } - _sound = NULL; + _sound = nullptr; } bool BaseSound::setSound(const Common::String &filename, Audio::Mixer::SoundType type, bool streamed) { if (_sound) { _gameRef->_soundMgr->removeSound(_sound); - _sound = NULL; + _sound = nullptr; } _soundFilename = Common::String(); // Set empty diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index d2b265a254..9c919abac6 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -49,13 +49,13 @@ namespace Wintermute { ////////////////////////////////////////////////////////////////////////// BaseSoundBuffer::BaseSoundBuffer(BaseGame *inGame) : BaseClass(inGame) { - _stream = NULL; - _handle = NULL; -// _sync = NULL; + _stream = nullptr; + _handle = nullptr; +// _sync = nullptr; _streamed = false; _filename = ""; - _file = NULL; + _file = nullptr; _privateVolume = 255; _volume = 255; @@ -76,10 +76,10 @@ BaseSoundBuffer::~BaseSoundBuffer() { if (_handle) { g_system->getMixer()->stopHandle(*_handle); delete _handle; - _handle = NULL; + _handle = nullptr; } delete _stream; - _stream = NULL; + _stream = nullptr; } @@ -134,7 +134,7 @@ bool BaseSoundBuffer::play(bool looping, uint32 startSample) { if (_handle) { g_system->getMixer()->stopHandle(*_handle); delete _handle; - _handle = NULL; + _handle = nullptr; } // Store the loop-value for save-games. setLooping(looping); diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 7e4a70afb2..c6eb871a85 100644 --- a/engines/wintermute/base/sound/base_sound_manager.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -94,7 +94,7 @@ bool BaseSoundMgr::initialize() { ////////////////////////////////////////////////////////////////////////// BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::Mixer::SoundType type, bool streamed) { if (!_soundAvailable) { - return NULL; + return nullptr; } BaseSoundBuffer *sound; @@ -114,7 +114,7 @@ BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::M sound = new BaseSoundBuffer(_gameRef); if (!sound) { - return NULL; + return nullptr; } sound->setStreaming(streamed); @@ -125,7 +125,7 @@ BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::M if (DID_FAIL(res)) { _gameRef->LOG(res, "Error loading sound '%s'", useFilename.c_str()); delete sound; - return NULL; + return nullptr; } // Make sure the master-volume is applied to the sound. @@ -136,7 +136,7 @@ BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::M return sound; - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/wintermute/dcgf.h b/engines/wintermute/dcgf.h index 0fbb1c6b29..4f8e96e0ac 100644 --- a/engines/wintermute/dcgf.h +++ b/engines/wintermute/dcgf.h @@ -32,12 +32,12 @@ ////////////////////////////////////////////////////////////////////////// #define DCGF_VER_MAJOR 1 -#define DCGF_VER_MINOR 2 +#define DCGF_VER_MINOR 1 #define DCGF_VER_BUILD 1 -#define DCGF_VER_SUFFIX "beta" +#define DCGF_VER_SUFFIX "ScummVM" #define DCGF_VER_BETA true -#define DCGF_NAME "WME Lite" +#define DCGF_NAME "WME-ScummVM" #define DCGF_MAGIC 0xDEC0ADDE // minimal saved game version we support diff --git a/engines/wintermute/graphics/transparent_surface.cpp b/engines/wintermute/graphics/transparent_surface.cpp index 0f2279c40e..11aeb26821 100644 --- a/engines/wintermute/graphics/transparent_surface.cpp +++ b/engines/wintermute/graphics/transparent_surface.cpp @@ -29,11 +29,11 @@ namespace Wintermute { -byte *TransparentSurface::_lookup = NULL; +byte *TransparentSurface::_lookup = nullptr; void TransparentSurface::destroyLookup() { delete[] _lookup; - _lookup = NULL; + _lookup = nullptr; } TransparentSurface::TransparentSurface() : Surface(), _enableAlphaBlit(true) {} @@ -219,8 +219,8 @@ Common::Rect TransparentSurface::blit(Graphics::Surface &target, int posX, int p #endif Graphics::Surface *img; - Graphics::Surface *imgScaled = NULL; - byte *savedPixels = NULL; + Graphics::Surface *imgScaled = nullptr; + byte *savedPixels = nullptr; if ((width != srcImage.w) || (height != srcImage.h)) { // Scale the image img = imgScaled = srcImage.scale(width, height); diff --git a/engines/wintermute/graphics/transparent_surface.h b/engines/wintermute/graphics/transparent_surface.h index 8b00dccbd9..dc079a1fbc 100644 --- a/engines/wintermute/graphics/transparent_surface.h +++ b/engines/wintermute/graphics/transparent_surface.h @@ -98,7 +98,7 @@ struct TransparentSurface : public Graphics::Surface { Common::Rect blit(Graphics::Surface &target, int posX = 0, int posY = 0, int flipping = FLIP_NONE, - Common::Rect *pPartRect = NULL, + Common::Rect *pPartRect = nullptr, uint color = BS_ARGB(255, 255, 255, 255), int width = -1, int height = -1); void applyColorKey(uint8 r, uint8 g, uint8 b, bool overwriteAlpha = false); diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index f61e61f6db..5c0406b353 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -42,7 +42,6 @@ MODULE_OBJS := \ base/file/base_file.o \ base/file/base_file_entry.o \ base/file/base_package.o \ - base/file/base_resources.o \ base/file/base_save_thumb_file.o \ base/font/base_font_bitmap.o \ base/font/base_font_truetype.o \ diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp index f13bdd2a3c..362c0da624 100644 --- a/engines/wintermute/platform_osystem.cpp +++ b/engines/wintermute/platform_osystem.cpp @@ -36,8 +36,8 @@ namespace Wintermute { -BaseGame *BasePlatform::_gameRef = NULL; -WintermuteEngine *BasePlatform::_engineRef = NULL; +BaseGame *BasePlatform::_gameRef = nullptr; +WintermuteEngine *BasePlatform::_engineRef = nullptr; #define CLASS_NAME "GF_FRAME" int BasePlatform::initialize(WintermuteEngine *engineRef, BaseGame *inGame, int argc, char *argv[]) { @@ -47,8 +47,8 @@ int BasePlatform::initialize(WintermuteEngine *engineRef, BaseGame *inGame, int } void BasePlatform::deinit() { - _gameRef = NULL; - _engineRef = NULL; + _gameRef = nullptr; + _engineRef = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -247,7 +247,7 @@ bool BasePlatform::unionRect(Rect32 *lprcDst, Rect32 *lprcSrc1, Rect32 *lprcSrc2 ////////////////////////////////////////////////////////////////////////// bool BasePlatform::copyRect(Rect32 *lprcDst, Rect32 *lprcSrc) { - if (lprcDst == NULL || lprcSrc == NULL) { + if (lprcDst == nullptr || lprcSrc == nullptr) { return false; } diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp index 06b36b84de..cda58bbb48 100644 --- a/engines/wintermute/system/sys_class.cpp +++ b/engines/wintermute/system/sys_class.cpp @@ -41,7 +41,7 @@ SystemClass::SystemClass(const AnsiString &name, PERSISTBUILD build, PERSISTLOAD _build = build; _load = load; - _next = NULL; + _next = nullptr; _savedID = -1; _persistent = persistentClass; _numInst = 0; @@ -119,7 +119,7 @@ void *SystemClass::idToPointer(int savedID) { return (it->_value)->getInstance(); } } - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp index 7c1911c2bf..3e2b8665ee 100644 --- a/engines/wintermute/system/sys_class_registry.cpp +++ b/engines/wintermute/system/sys_class_registry.cpp @@ -115,7 +115,7 @@ bool SystemClassRegistry::registerInstance(const char *className, void *instance } SystemInstance *inst = (*mapIt)._value->addInstance(instance, _count++); - return (inst != NULL); + return (inst != nullptr); } ////////////////////////////////////////////////////////////////////////// @@ -152,7 +152,7 @@ bool SystemClassRegistry::unregisterInstance(const char *className, void *instan ////////////////////////////////////////////////////////////////////////// bool SystemClassRegistry::getPointerID(void *pointer, int *classID, int *instanceID) { - if (pointer == NULL) { + if (pointer == nullptr) { return true; } @@ -173,7 +173,7 @@ bool SystemClassRegistry::getPointerID(void *pointer, int *classID, int *instanc void *SystemClassRegistry::idToPointer(int classID, int instanceID) { SavedInstanceMap::iterator it = _savedInstanceMap.find(instanceID); if (it == _savedInstanceMap.end()) { - return NULL; + return nullptr; } else { return (*it)._value->getInstance(); } diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index 7967d566f9..6ee577f009 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -48,11 +48,11 @@ IMPLEMENT_PERSISTENT(UIButton, false) ////////////////////////////////////////////////////////////////////////// UIButton::UIButton(BaseGame *inGame) : UIObject(inGame) { - _backPress = _backHover = _backDisable = _backFocus = NULL; + _backPress = _backHover = _backDisable = _backFocus = nullptr; - _fontHover = _fontPress = _fontDisable = _fontFocus = NULL; + _fontHover = _fontPress = _fontDisable = _fontFocus = nullptr; - _imageDisable = _imagePress = _imageHover = _imageFocus = NULL; + _imageDisable = _imagePress = _imageHover = _imageFocus = nullptr; _align = TAL_CENTER; @@ -104,7 +104,7 @@ UIButton::~UIButton() { ////////////////////////////////////////////////////////////////////////// bool UIButton::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "UIButton::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -235,7 +235,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _back = new UITiledImage(_gameRef); if (!_back || DID_FAIL(_back->loadFile((char *)params))) { delete _back; - _back = NULL; + _back = nullptr; cmd = PARSERR_GENERIC; } break; @@ -245,7 +245,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _backHover = new UITiledImage(_gameRef); if (!_backHover || DID_FAIL(_backHover->loadFile((char *)params))) { delete _backHover; - _backHover = NULL; + _backHover = nullptr; cmd = PARSERR_GENERIC; } break; @@ -255,7 +255,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _backPress = new UITiledImage(_gameRef); if (!_backPress || DID_FAIL(_backPress->loadFile((char *)params))) { delete _backPress; - _backPress = NULL; + _backPress = nullptr; cmd = PARSERR_GENERIC; } break; @@ -265,7 +265,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _backDisable = new UITiledImage(_gameRef); if (!_backDisable || DID_FAIL(_backDisable->loadFile((char *)params))) { delete _backDisable; - _backDisable = NULL; + _backDisable = nullptr; cmd = PARSERR_GENERIC; } break; @@ -275,7 +275,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _backFocus = new UITiledImage(_gameRef); if (!_backFocus || DID_FAIL(_backFocus->loadFile((char *)params))) { delete _backFocus; - _backFocus = NULL; + _backFocus = nullptr; cmd = PARSERR_GENERIC; } break; @@ -285,7 +285,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _image = new BaseSprite(_gameRef); if (!_image || DID_FAIL(_image->loadFile((char *)params))) { delete _image; - _image = NULL; + _image = nullptr; cmd = PARSERR_GENERIC; } break; @@ -295,7 +295,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _imageHover = new BaseSprite(_gameRef); if (!_imageHover || DID_FAIL(_imageHover->loadFile((char *)params))) { delete _imageHover; - _imageHover = NULL; + _imageHover = nullptr; cmd = PARSERR_GENERIC; } break; @@ -305,7 +305,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _imagePress = new BaseSprite(_gameRef); if (!_imagePress || DID_FAIL(_imagePress->loadFile((char *)params))) { delete _imagePress; - _imagePress = NULL; + _imagePress = nullptr; cmd = PARSERR_GENERIC; } break; @@ -315,7 +315,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _imageDisable = new BaseSprite(_gameRef); if (!_imageDisable || DID_FAIL(_imageDisable->loadFile((char *)params))) { delete _imageDisable; - _imageDisable = NULL; + _imageDisable = nullptr; cmd = PARSERR_GENERIC; } break; @@ -325,7 +325,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _imageFocus = new BaseSprite(_gameRef); if (!_imageFocus || DID_FAIL(_imageFocus->loadFile((char *)params))) { delete _imageFocus; - _imageFocus = NULL; + _imageFocus = nullptr; cmd = PARSERR_GENERIC; } break; @@ -416,7 +416,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -592,7 +592,7 @@ bool UIButton::saveAsText(BaseDynamicBuffer *buffer, int indent) { void UIButton::correctSize() { Rect32 rect; - BaseSprite *img = NULL; + BaseSprite *img = nullptr; if (_image) { img = _image; } else if (_imageDisable) { @@ -622,15 +622,15 @@ void UIButton::correctSize() { } if (_text) { - int text_height; + int textHeight; if (_font) { - text_height = _font->getTextHeight((byte *)_text, _width); + textHeight = _font->getTextHeight((byte *)_text, _width); } else { - text_height = _gameRef->_systemFont->getTextHeight((byte *)_text, _width); + textHeight = _gameRef->getSystemFont()->getTextHeight((byte *)_text, _width); } - if (text_height > _height) { - _height = text_height; + if (textHeight > _height) { + _height = textHeight; } } @@ -650,8 +650,8 @@ bool UIButton::display(int offsetX, int offsetY) { return STATUS_OK; } - UITiledImage *back = NULL; - BaseSprite *image = NULL; + UITiledImage *back = nullptr; + BaseSprite *image = nullptr; BaseFont *font = 0; //RECT rect; @@ -717,7 +717,7 @@ bool UIButton::display(int offsetX, int offsetY) { if (_font) { font = _font; } else { - font = _gameRef->_systemFont; + font = _gameRef->getSystemFont(); } } @@ -734,9 +734,9 @@ bool UIButton::display(int offsetX, int offsetY) { if (back) { back->display(offsetX + _posX, offsetY + _posY, _width, _height); } - //if (image) image->Draw(ImageX +((_press||_oneTimePress)&&back?1:0), ImageY +((_press||_oneTimePress)&&back?1:0), NULL); + //if (image) image->Draw(ImageX +((_press||_oneTimePress)&&back?1:0), ImageY +((_press||_oneTimePress)&&back?1:0), nullptr); if (image) { - image->draw(imageX + ((_press || _oneTimePress) && back ? 1 : 0), imageY + ((_press || _oneTimePress) && back ? 1 : 0), _pixelPerfect ? this : NULL); + image->draw(imageX + ((_press || _oneTimePress) && back ? 1 : 0), imageY + ((_press || _oneTimePress) && back ? 1 : 0), _pixelPerfect ? this : nullptr); } if (font && _text) { @@ -745,7 +745,7 @@ bool UIButton::display(int offsetX, int offsetY) { } if (!_pixelPerfect || !_image) { - _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); + _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); } // reset unused sprites @@ -800,11 +800,11 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->_fontStorage->removeFont(_fontDisable); } if (val->isNULL()) { - _fontDisable = NULL; + _fontDisable = nullptr; stack->pushBool(true); } else { _fontDisable = _gameRef->_fontStorage->addFont(val->getString()); - stack->pushBool(_fontDisable != NULL); + stack->pushBool(_fontDisable != nullptr); } return STATUS_OK; } @@ -820,11 +820,11 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->_fontStorage->removeFont(_fontHover); } if (val->isNULL()) { - _fontHover = NULL; + _fontHover = nullptr; stack->pushBool(true); } else { _fontHover = _gameRef->_fontStorage->addFont(val->getString()); - stack->pushBool(_fontHover != NULL); + stack->pushBool(_fontHover != nullptr); } return STATUS_OK; } @@ -840,11 +840,11 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->_fontStorage->removeFont(_fontPress); } if (val->isNULL()) { - _fontPress = NULL; + _fontPress = nullptr; stack->pushBool(true); } else { _fontPress = _gameRef->_fontStorage->addFont(val->getString()); - stack->pushBool(_fontPress != NULL); + stack->pushBool(_fontPress != nullptr); } return STATUS_OK; } @@ -860,11 +860,11 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->_fontStorage->removeFont(_fontFocus); } if (val->isNULL()) { - _fontFocus = NULL; + _fontFocus = nullptr; stack->pushBool(true); } else { _fontFocus = _gameRef->_fontStorage->addFont(val->getString()); - stack->pushBool(_fontFocus != NULL); + stack->pushBool(_fontFocus != nullptr); } return STATUS_OK; } @@ -880,7 +880,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack const char *filename = stack->pop()->getString(); if (!_imageDisable || DID_FAIL(_imageDisable->loadFile(filename))) { delete _imageDisable; - _imageDisable = NULL; + _imageDisable = nullptr; stack->pushBool(false); } else { stack->pushBool(true); @@ -929,7 +929,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack const char *filename = stack->pop()->getString(); if (!_imageHover || DID_FAIL(_imageHover->loadFile(filename))) { delete _imageHover; - _imageHover = NULL; + _imageHover = nullptr; stack->pushBool(false); } else { stack->pushBool(true); @@ -977,7 +977,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack const char *filename = stack->pop()->getString(); if (!_imagePress || DID_FAIL(_imagePress->loadFile(filename))) { delete _imagePress; - _imagePress = NULL; + _imagePress = nullptr; stack->pushBool(false); } else { stack->pushBool(true); @@ -1025,7 +1025,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack const char *filename = stack->pop()->getString(); if (!_imageFocus || DID_FAIL(_imageFocus->loadFile(filename))) { delete _imageFocus; - _imageFocus = NULL; + _imageFocus = nullptr; stack->pushBool(false); } else { stack->pushBool(true); diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h index 93333a2534..fea264976f 100644 --- a/engines/wintermute/ui/ui_button.h +++ b/engines/wintermute/ui/ui_button.h @@ -62,7 +62,7 @@ public: UITiledImage *_backHover; UITiledImage *_backDisable; UITiledImage *_backFocus; - UIButton(BaseGame *inGame = NULL); + UIButton(BaseGame *inGame = nullptr); virtual ~UIButton(); bool loadFile(const char *filename); bool loadBuffer(byte *buffer, bool complete = true); diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index a3283d5a01..0a2e6f13bc 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -56,12 +56,12 @@ IMPLEMENT_PERSISTENT(UIEdit, false) UIEdit::UIEdit(BaseGame *inGame) : UIObject(inGame) { _type = UI_EDIT; - _fontSelected = NULL; + _fontSelected = nullptr; _selStart = _selEnd = 10000; _scrollOffset = 0; - _cursorChar = NULL; + _cursorChar = nullptr; setCursorChar("|"); _cursorBlinkRate = 600; @@ -88,14 +88,14 @@ UIEdit::~UIEdit() { } delete[] _cursorChar; - _cursorChar = NULL; + _cursorChar = nullptr; } ////////////////////////////////////////////////////////////////////////// bool UIEdit::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "UIEdit::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -194,7 +194,7 @@ bool UIEdit::loadBuffer(byte *buffer, bool complete) { _back = new UITiledImage(_gameRef); if (!_back || DID_FAIL(_back->loadFile((char *)params))) { delete _back; - _back = NULL; + _back = nullptr; cmd = PARSERR_GENERIC; } break; @@ -204,7 +204,7 @@ bool UIEdit::loadBuffer(byte *buffer, bool complete) { _image = new BaseSprite(_gameRef); if (!_image || DID_FAIL(_image->loadFile((char *)params))) { delete _image; - _image = NULL; + _image = nullptr; cmd = PARSERR_GENERIC; } break; @@ -263,7 +263,7 @@ bool UIEdit::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -388,7 +388,7 @@ bool UIEdit::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, _gameRef->_fontStorage->removeFont(_fontSelected); } _fontSelected = _gameRef->_fontStorage->addFont(stack->pop()->getString()); - stack->pushBool(_fontSelected != NULL); + stack->pushBool(_fontSelected != nullptr); return STATUS_OK; } else { @@ -579,7 +579,7 @@ bool UIEdit::display(int offsetX, int offsetY) { _back->display(offsetX + _posX, offsetY + _posY, _width, _height); } if (_image) { - _image->draw(offsetX + _posX, offsetY + _posY, NULL); + _image->draw(offsetX + _posX, offsetY + _posY, nullptr); } // prepare fonts @@ -589,7 +589,7 @@ bool UIEdit::display(int offsetX, int offsetY) { if (_font) { font = _font; } else { - font = _gameRef->_systemFont; + font = _gameRef->getSystemFont(); } if (_fontSelected) { @@ -726,7 +726,7 @@ bool UIEdit::display(int offsetX, int offsetY) { } - _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); + _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); _gameRef->_textEncoding = OrigEncoding; diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp index 1cb4e0926b..00d442e895 100644 --- a/engines/wintermute/ui/ui_entity.cpp +++ b/engines/wintermute/ui/ui_entity.cpp @@ -43,7 +43,7 @@ IMPLEMENT_PERSISTENT(UIEntity, false) ////////////////////////////////////////////////////////////////////////// UIEntity::UIEntity(BaseGame *inGame) : UIObject(inGame) { _type = UI_CUSTOM; - _entity = NULL; + _entity = nullptr; } @@ -52,14 +52,14 @@ UIEntity::~UIEntity() { if (_entity) { _gameRef->unregisterObject(_entity); } - _entity = NULL; + _entity = nullptr; } ////////////////////////////////////////////////////////////////////////// bool UIEntity::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "UIEntity::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -223,7 +223,7 @@ bool UIEntity::setEntity(const char *filename) { _entity = new AdEntity(_gameRef); if (!_entity || DID_FAIL(_entity->loadFile(filename))) { delete _entity; - _entity = NULL; + _entity = nullptr; return STATUS_FAILED; } else { _entity->_nonIntMouseEvents = true; diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp index 8e5bae993c..9dea3dadf9 100644 --- a/engines/wintermute/ui/ui_object.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -43,27 +43,27 @@ IMPLEMENT_PERSISTENT(UIObject, false) ////////////////////////////////////////////////////////////////////////// UIObject::UIObject(BaseGame *inGame) : BaseObject(inGame) { - _back = NULL; - _image = NULL; - _font = NULL; - _text = NULL; + _back = nullptr; + _image = nullptr; + _font = nullptr; + _text = nullptr; _sharedFonts = _sharedImages = false; _width = _height = 0; - _listenerObject = NULL; - _listenerParamObject = NULL; + _listenerObject = nullptr; + _listenerParamObject = nullptr; _listenerParamDWORD = 0; _disable = false; _visible = true; _type = UI_UNKNOWN; - _parent = NULL; + _parent = nullptr; _parentNotify = false; - _focusedWidget = NULL; + _focusedWidget = nullptr; _canFocus = false; _nonIntMouseEvents = true; @@ -91,7 +91,7 @@ UIObject::~UIObject() { delete[] _text; } - _focusedWidget = NULL; // ref only + _focusedWidget = nullptr; // ref only } @@ -168,11 +168,11 @@ bool UIObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->_fontStorage->removeFont(_font); } if (val->isNULL()) { - _font = NULL; + _font = nullptr; stack->pushBool(true); } else { _font = _gameRef->_fontStorage->addFont(val->getString()); - stack->pushBool(_font != NULL); + stack->pushBool(_font != nullptr); } return STATUS_OK; } @@ -187,7 +187,7 @@ bool UIObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack /* const char *filename = */ val->getString(); delete _image; - _image = NULL; + _image = nullptr; if (val->isNULL()) { stack->pushBool(true); return STATUS_OK; @@ -196,7 +196,7 @@ bool UIObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _image = new BaseSprite(_gameRef); if (!_image || DID_FAIL(_image->loadFile(val->getString()))) { delete _image; - _image = NULL; + _image = nullptr; stack->pushBool(false); } else { stack->pushBool(true); diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h index ec2ea33de1..c77acfef41 100644 --- a/engines/wintermute/ui/ui_object.h +++ b/engines/wintermute/ui/ui_object.h @@ -60,7 +60,7 @@ public: bool _visible; UITiledImage *_back; bool _disable; - UIObject(BaseGame *inGame = NULL); + UIObject(BaseGame *inGame = nullptr); virtual ~UIObject(); int _width; int _height; diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp index 2c10f176c7..3b5adf07b7 100644 --- a/engines/wintermute/ui/ui_text.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -69,14 +69,14 @@ bool UIText::display(int offsetX, int offsetY) { BaseFont *font = _font; if (!font) { - font = _gameRef->_systemFont; + font = _gameRef->getSystemFont(); } if (_back) { _back->display(offsetX + _posX, offsetY + _posY, _width, _height); } if (_image) { - _image->draw(offsetX + _posX, offsetY + _posY, NULL); + _image->draw(offsetX + _posX, offsetY + _posY, nullptr); } if (font && _text) { @@ -104,7 +104,7 @@ bool UIText::display(int offsetX, int offsetY) { ////////////////////////////////////////////////////////////////////////// bool UIText::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "UIText::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -203,7 +203,7 @@ bool UIText::loadBuffer(byte *buffer, bool complete) { _back = new UITiledImage(_gameRef); if (!_back || DID_FAIL(_back->loadFile((char *)params))) { delete _back; - _back = NULL; + _back = nullptr; cmd = PARSERR_GENERIC; } break; @@ -213,7 +213,7 @@ bool UIText::loadBuffer(byte *buffer, bool complete) { _image = new BaseSprite(_gameRef); if (!_image || DID_FAIL(_image->loadFile((char *)params))) { delete _image; - _image = NULL; + _image = nullptr; cmd = PARSERR_GENERIC; } break; @@ -274,7 +274,7 @@ bool UIText::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; diff --git a/engines/wintermute/ui/ui_text.h b/engines/wintermute/ui/ui_text.h index da4d113500..11dcdb166d 100644 --- a/engines/wintermute/ui/ui_text.h +++ b/engines/wintermute/ui/ui_text.h @@ -40,7 +40,7 @@ private: public: virtual bool display(int offsetX, int offsetY); DECLARE_PERSISTENT(UIText, UIObject) - UIText(BaseGame *inGame = NULL); + UIText(BaseGame *inGame = nullptr); virtual ~UIText(); TTextAlign _textAlign; TVerticalAlign _verticalAlign; diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index 03fef5ca05..be9f87cf58 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -42,7 +42,7 @@ IMPLEMENT_PERSISTENT(UITiledImage, false) ////////////////////////////////////////////////////////////////////////// UITiledImage::UITiledImage(BaseGame *inGame) : BaseObject(inGame) { - _image = NULL; + _image = nullptr; BasePlatform::setRectEmpty(&_upLeft); BasePlatform::setRectEmpty(&_upMiddle); @@ -59,7 +59,7 @@ UITiledImage::UITiledImage(BaseGame *inGame) : BaseObject(inGame) { ////////////////////////////////////////////////////////////////////////// UITiledImage::~UITiledImage() { delete _image; - _image = NULL; + _image = nullptr; } @@ -120,7 +120,7 @@ bool UITiledImage::display(int x, int y, int width, int height) { ////////////////////////////////////////////////////////////////////////// bool UITiledImage::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "UITiledImage::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -205,7 +205,7 @@ bool UITiledImage::loadBuffer(byte *buffer, bool complete) { _image = new BaseSubFrame(_gameRef); if (!_image || DID_FAIL(_image->setSurface((char *)params))) { delete _image; - _image = NULL; + _image = nullptr; cmd = PARSERR_GENERIC; } break; diff --git a/engines/wintermute/ui/ui_tiled_image.h b/engines/wintermute/ui/ui_tiled_image.h index edea84f346..ded7a285dd 100644 --- a/engines/wintermute/ui/ui_tiled_image.h +++ b/engines/wintermute/ui/ui_tiled_image.h @@ -44,7 +44,7 @@ public: virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent); bool display(int x, int y, int width, int height); - UITiledImage(BaseGame *inGame = NULL); + UITiledImage(BaseGame *inGame = nullptr); virtual ~UITiledImage(); private: BaseSubFrame *_image; diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 9606486efb..39bc1bdcfe 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -59,9 +59,9 @@ UIWindow::UIWindow(BaseGame *inGame) : UIObject(inGame) { _titleAlign = TAL_LEFT; _transparent = false; - _backInactive = NULL; - _fontInactive = NULL; - _imageInactive = NULL; + _backInactive = nullptr; + _fontInactive = nullptr; + _imageInactive = nullptr; _type = UI_WINDOW; _canFocus = true; @@ -70,8 +70,8 @@ UIWindow::UIWindow(BaseGame *inGame) : UIObject(inGame) { _dragFrom.x = _dragFrom.y = 0; _mode = WINDOW_NORMAL; - _shieldWindow = NULL; - _shieldButton = NULL; + _shieldWindow = nullptr; + _shieldButton = nullptr; _fadeColor = 0x00000000; _fadeBackground = false; @@ -81,7 +81,7 @@ UIWindow::UIWindow(BaseGame *inGame) : UIObject(inGame) { _inGame = false; _clipContents = false; - _viewport = NULL; + _viewport = nullptr; _pauseMusic = true; } @@ -99,9 +99,9 @@ void UIWindow::cleanup() { delete _shieldWindow; delete _shieldButton; delete _viewport; - _shieldWindow = NULL; - _shieldButton = NULL; - _viewport = NULL; + _shieldWindow = nullptr; + _shieldButton = nullptr; + _viewport = nullptr; delete _backInactive; if (!_sharedFonts && _fontInactive) { @@ -210,7 +210,7 @@ bool UIWindow::display(int offsetX, int offsetY) { back->display(_posX + offsetX, _posY + offsetY, _width, _height); } if (image) { - image->draw(_posX + offsetX, _posY + offsetY, _transparent ? NULL : this); + image->draw(_posX + offsetX, _posY + offsetY, _transparent ? nullptr : this); } if (!BasePlatform::isRectEmpty(&_titleRect) && font && _text) { @@ -218,7 +218,7 @@ bool UIWindow::display(int offsetX, int offsetY) { } if (!_transparent && !image) { - _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false)); + _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, nullptr, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false)); } for (uint32 i = 0; i < _widgets.size(); i++) { @@ -240,7 +240,7 @@ bool UIWindow::display(int offsetX, int offsetY) { ////////////////////////////////////////////////////////////////////////// bool UIWindow::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); - if (buffer == NULL) { + if (buffer == nullptr) { _gameRef->LOG(0, "UIWindow::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -374,7 +374,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { _back = new UITiledImage(_gameRef); if (!_back || DID_FAIL(_back->loadFile((char *)params))) { delete _back; - _back = NULL; + _back = nullptr; cmd = PARSERR_GENERIC; } break; @@ -384,7 +384,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { _backInactive = new UITiledImage(_gameRef); if (!_backInactive || DID_FAIL(_backInactive->loadFile((char *)params))) { delete _backInactive; - _backInactive = NULL; + _backInactive = nullptr; cmd = PARSERR_GENERIC; } break; @@ -394,7 +394,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { _image = new BaseSprite(_gameRef); if (!_image || DID_FAIL(_image->loadFile((char *)params))) { delete _image; - _image = NULL; + _image = nullptr; cmd = PARSERR_GENERIC; } break; @@ -404,7 +404,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { _imageInactive = new BaseSprite(_gameRef); if (!_imageInactive || DID_FAIL(_imageInactive->loadFile((char *)params))) { delete _imageInactive; - _imageInactive = NULL; + _imageInactive = nullptr; cmd = PARSERR_GENERIC; } break; @@ -473,7 +473,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { _cursor = new BaseSprite(_gameRef); if (!_cursor || DID_FAIL(_cursor->loadFile((char *)params))) { delete _cursor; - _cursor = NULL; + _cursor = nullptr; cmd = PARSERR_GENERIC; } break; @@ -482,7 +482,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { UIButton *btn = new UIButton(_gameRef); if (!btn || DID_FAIL(btn->loadBuffer(params, false))) { delete btn; - btn = NULL; + btn = nullptr; cmd = PARSERR_GENERIC; } else { btn->_parent = this; @@ -495,7 +495,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { UIText *text = new UIText(_gameRef); if (!text || DID_FAIL(text->loadBuffer(params, false))) { delete text; - text = NULL; + text = nullptr; cmd = PARSERR_GENERIC; } else { text->_parent = this; @@ -508,7 +508,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { UIEdit *edit = new UIEdit(_gameRef); if (!edit || DID_FAIL(edit->loadBuffer(params, false))) { delete edit; - edit = NULL; + edit = nullptr; cmd = PARSERR_GENERIC; } else { edit->_parent = this; @@ -521,7 +521,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { UIWindow *win = new UIWindow(_gameRef); if (!win || DID_FAIL(win->loadBuffer(params, false))) { delete win; - win = NULL; + win = nullptr; cmd = PARSERR_GENERIC; } else { win->_parent = this; @@ -616,7 +616,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { _fadeColor = BYTETORGBA(fadeR, fadeG, fadeB, fadeA); } - _focusedWidget = NULL; + _focusedWidget = nullptr; return STATUS_OK; } @@ -795,7 +795,7 @@ bool UIWindow::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->_fontStorage->removeFont(_fontInactive); } _fontInactive = _gameRef->_fontStorage->addFont(stack->pop()->getString()); - stack->pushBool(_fontInactive != NULL); + stack->pushBool(_fontInactive != nullptr); return STATUS_OK; } @@ -811,7 +811,7 @@ bool UIWindow::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack const char *filename = stack->pop()->getString(); if (!_imageInactive || DID_FAIL(_imageInactive->loadFile(filename))) { delete _imageInactive; - _imageInactive = NULL; + _imageInactive = nullptr; stack->pushBool(false); } else { stack->pushBool(true); @@ -1294,7 +1294,7 @@ bool UIWindow::moveFocus(bool forward) { } } if (!found) { - _focusedWidget = NULL; + _focusedWidget = nullptr; } if (!_focusedWidget) { diff --git a/engines/wintermute/utils/string_util.cpp b/engines/wintermute/utils/string_util.cpp index a1053bbef6..9fffad85cd 100644 --- a/engines/wintermute/utils/string_util.cpp +++ b/engines/wintermute/utils/string_util.cpp @@ -205,7 +205,7 @@ bool StringUtil::isUtf8BOM(const byte *buffer, uint32 bufferSize) { ////////////////////////////////////////////////////////////////////////// int StringUtil::indexOf(const WideString &str, const WideString &toFind, size_t startFrom) { const char *index = strstr(str.c_str(), toFind.c_str()); - if (index == NULL) { + if (index == nullptr) { return -1; } else { return index - str.c_str(); diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp index 824b16ccdb..6e0d69edbe 100644 --- a/engines/wintermute/utils/utils.cpp +++ b/engines/wintermute/utils/utils.cpp @@ -96,7 +96,7 @@ char *BaseUtils::setString(char **string, const char *value) { char *BaseUtils::strEntry(int entry, const char *str, const char delim) { int numEntries = 0; - const char *start = NULL; + const char *start = nullptr; int len = 0; for (uint32 i = 0; i <= strlen(str); i++) { @@ -117,7 +117,7 @@ char *BaseUtils::strEntry(int entry, const char *str, const char delim) { } } } - return NULL; + return nullptr; } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp index 2577b8aedc..42857b5c1b 100644 --- a/engines/wintermute/video/video_player.cpp +++ b/engines/wintermute/video/video_player.cpp @@ -50,7 +50,7 @@ bool VideoPlayer::setDefaults() { _playPosX = _playPosY = 0; _playZoom = 0.0f; - _filename = NULL; + _filename = nullptr; _slowRendering = false; diff --git a/engines/wintermute/video/video_player.h b/engines/wintermute/video/video_player.h index d5466da679..a49e910b0c 100644 --- a/engines/wintermute/video/video_player.h +++ b/engines/wintermute/video/video_player.h @@ -58,7 +58,7 @@ public: bool _playing; bool display(); bool update(); - bool initialize(const char *inFilename, const char *subtitleFile = NULL); + bool initialize(const char *inFilename, const char *subtitleFile = nullptr); bool cleanup(); VideoPlayer(BaseGame *inGame); virtual ~VideoPlayer(); diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp index d14c807e11..1f6842c416 100644 --- a/engines/wintermute/video/video_theora_player.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -51,7 +51,7 @@ VideoTheoraPlayer::VideoTheoraPlayer(BaseGame *inGame) : BaseClass(inGame) { ////////////////////////////////////////////////////////////////////////// void VideoTheoraPlayer::SetDefaults() { - _file = NULL; + _file = nullptr; _filename = ""; _startTime = 0; _looping = false; @@ -68,8 +68,8 @@ void VideoTheoraPlayer::SetDefaults() { _playbackStarted = false; _dontDropFrames = false; - _texture = NULL; - _alphaImage = NULL; + _texture = nullptr; + _alphaImage = nullptr; _alphaFilename = ""; _frameRendered = false; @@ -84,10 +84,10 @@ void VideoTheoraPlayer::SetDefaults() { _savedState = THEORA_STATE_NONE; _savedPos = 0; _volume = 100; - _theoraDecoder = NULL; + _theoraDecoder = nullptr; // TODO: Add subtitles-support - //_subtitler = NULL; + //_subtitler = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ VideoTheoraPlayer::~VideoTheoraPlayer(void) { void VideoTheoraPlayer::cleanup() { if (_file) { BaseFileManager::getEngineInstance()->closeFile(_file); - _file = NULL; + _file = nullptr; } _surface.free(); @@ -108,11 +108,11 @@ void VideoTheoraPlayer::cleanup() { _theoraDecoder->close(); } delete _theoraDecoder; - _theoraDecoder = NULL; + _theoraDecoder = nullptr; delete _alphaImage; - _alphaImage = NULL; + _alphaImage = nullptr; delete _texture; - _texture = NULL; + _texture = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -157,7 +157,7 @@ bool VideoTheoraPlayer::resetStream() { _theoraDecoder->close(); } delete _theoraDecoder; - _theoraDecoder = NULL; + _theoraDecoder = nullptr; _file = BaseFileManager::getEngineInstance()->openFile(_filename, true, false); if (!_file) { @@ -419,7 +419,7 @@ bool VideoTheoraPlayer::setAlphaImage(const Common::String &filename) { _alphaImage = new BaseImage(); if (!_alphaImage || DID_FAIL(_alphaImage->loadFile(filename))) { delete _alphaImage; - _alphaImage = NULL; + _alphaImage = nullptr; _alphaFilename = ""; return STATUS_FAILED; } diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index 593c1b9666..7a6742271c 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -62,7 +62,7 @@ public: //CVidSubtitler *_subtitler; // control methods - bool initialize(const Common::String &filename, const Common::String &subtitleFile = NULL); + bool initialize(const Common::String &filename, const Common::String &subtitleFile = nullptr); bool initializeSimple(); bool update(); bool play(TVideoPlayback type = VID_PLAY_CENTER, int x = 0, int y = 0, bool freezeGame = false, bool freezeMusic = true, bool looping = false, uint32 startTime = 0, float forceZoom = -1.0f, int volume = -1); diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index 4d3adc95b2..f33452d11c 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -49,7 +49,7 @@ namespace Wintermute { // This might not be the prettiest solution WintermuteEngine::WintermuteEngine() : Engine(g_system) { _game = new AdGame(""); - _debugger = NULL; + _debugger = nullptr; _trigDebug = false; } @@ -74,8 +74,8 @@ WintermuteEngine::WintermuteEngine(OSystem *syst, const ADGameDescription *desc) DebugMan.addDebugChannel(kWintermuteDebugAudio, "audio", "audio-playback-related issues"); DebugMan.addDebugChannel(kWintermuteDebugGeneral, "general", "various issues not covered by any of the above"); - _game = NULL; - _debugger = NULL; + _game = nullptr; + _debugger = nullptr; _trigDebug = false; } @@ -139,7 +139,7 @@ int WintermuteEngine::init() { return 1; } BaseEngine::instance().setGameRef(_game); - BasePlatform::initialize(this, _game, 0, NULL); + BasePlatform::initialize(this, _game, 0, nullptr); bool windowedMode = !ConfMan.getBool("fullscreen"); @@ -174,7 +174,7 @@ int WintermuteEngine::init() { if (DID_FAIL(_game->loadSettings("startup.settings"))) { _game->LOG(0, "Error loading game settings."); delete _game; - _game = NULL; + _game = nullptr; warning("Some of the essential files are missing. Please reinstall."); return 2; @@ -190,7 +190,7 @@ int WintermuteEngine::init() { _game->LOG(ret, "Error initializing renderer. Exiting."); delete _game; - _game = NULL; + _game = nullptr; return 3; } @@ -209,7 +209,7 @@ int WintermuteEngine::init() { if (DID_FAIL(_game->loadFile(_game->_settingsGameFile ? _game->_settingsGameFile : "default.game"))) { _game->LOG(ret, "Error loading game file. Exiting."); delete _game; - _game = NULL; + _game = nullptr; return false; } @@ -278,7 +278,7 @@ int WintermuteEngine::messageLoop() { if (_game) { delete _game; - _game = NULL; + _game = nullptr; } return 0; } @@ -309,7 +309,7 @@ bool WintermuteEngine::canLoadGameStateCurrently() { bool WintermuteEngine::getGameInfo(const Common::FSList &fslist, Common::String &name, Common::String &caption) { bool retVal = false; caption = name = "(invalid)"; - Common::SeekableReadStream *stream = NULL; + Common::SeekableReadStream *stream = nullptr; // Quick-fix, instead of possibly breaking the persistence-system, let's just roll with it BaseFileManager *fileMan = new BaseFileManager(Common::UNK_LANG); fileMan->registerPackages(fslist); diff --git a/graphics/decoders/jpeg.cpp b/graphics/decoders/jpeg.cpp index 08bc1f7a3d..8adbab133f 100644 --- a/graphics/decoders/jpeg.cpp +++ b/graphics/decoders/jpeg.cpp @@ -74,7 +74,7 @@ const Surface *JPEGDecoder::getSurface() const { // Create an RGBA8888 surface _rgbSurface = new Graphics::Surface(); - _rgbSurface->create(_w, _h, Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); + _rgbSurface->create(_w, _h, Graphics::PixelFormat(4, 8, 8, 8, 0, 24, 16, 8, 0)); // Get our component surfaces const Graphics::Surface *yComponent = getComponent(1); @@ -215,28 +215,34 @@ bool JPEGDecoder::loadStream(Common::SeekableReadStream &stream) { bool JPEGDecoder::readJFIF() { uint16 length = _stream->readUint16BE(); uint32 tag = _stream->readUint32BE(); + if (tag != MKTAG('J', 'F', 'I', 'F')) { warning("JPEGDecoder::readJFIF() tag mismatch"); return false; } + if (_stream->readByte() != 0) { // NULL warning("JPEGDecoder::readJFIF() NULL mismatch"); return false; } + byte majorVersion = _stream->readByte(); byte minorVersion = _stream->readByte(); - if (majorVersion != 1 || minorVersion != 1) - warning("JPEGDecoder::readJFIF() Non-v1.1 JPEGs may not be handled correctly"); + if (majorVersion != 1 || minorVersion > 2) + warning("JPEGDecoder::readJFIF(): v%d.%02d JPEGs may not be handled correctly", majorVersion, minorVersion); + /* byte densityUnits = */_stream->readByte(); /* uint16 xDensity = */_stream->readUint16BE(); /* uint16 yDensity = */_stream->readUint16BE(); byte thumbW = _stream->readByte(); byte thumbH = _stream->readByte(); + _stream->seek(thumbW * thumbH * 3, SEEK_CUR); // Ignore thumbnail if (length != (thumbW * thumbH * 3) + 16) { warning("JPEGDecoder::readJFIF() length mismatch"); return false; } + return true; } diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp index b88db39f36..c140dc8644 100644 --- a/graphics/primitives.cpp +++ b/graphics/primitives.cpp @@ -78,4 +78,4 @@ void drawThickLine(int x0, int y0, int x1, int y1, int penX, int penY, int color drawLine(x0 + x, y0 + y, x1 + x, y1 + y, color, plotProc, data); } -} // End of namespace Graphics +} // End of namespace Graphics diff --git a/graphics/primitives.h b/graphics/primitives.h index f0780afc2e..f4a92683ab 100644 --- a/graphics/primitives.h +++ b/graphics/primitives.h @@ -27,6 +27,6 @@ namespace Graphics { void drawLine(int x0, int y0, int x1, int y1, int color, void (*plotProc)(int, int, int, void *), void *data); void drawThickLine(int x0, int y0, int x1, int y1, int penX, int penY, int color, void (*plotProc)(int, int, int, void *), void *data); -} // End of namespace Graphics +} // End of namespace Graphics #endif diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index dda9f2c2b5..6e5fd291b7 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -35,7 +35,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.19" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.20" class OSystem; diff --git a/gui/about.cpp b/gui/about.cpp index e2b7064279..088971f273 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -37,14 +37,16 @@ enum { kScrollMillisPerPixel = 60 }; -// The following commands can be put at the start of a line (all subject to change): -// \C, \L, \R -- set center/left/right alignment -// \c0 - \c4 -- set a custom color: -// 0 normal text (green) -// 1 highlighted text (light green) -// 2 light border (light gray) -// 3 dark border (dark gray) -// 4 background (black) +// Every Line should start with a letter followed by a digit. Currently those can be +// (all subject to change) +// Letter: +// C, L, R -- set center/left/right alignment +// A -- ASCII text to replace the next (latin1) line +// Digit: +// 0 - 2 -- set a custom color: +// 0 normal text +// 1 highlighted text +// 2 disabled text // TODO: Maybe add a tab/indent feature; that is, make it possible to specify // an amount by which that line shall be indented (the indent of course would have // to be considered while performing any word wrapping, too). @@ -137,9 +139,26 @@ void AboutDialog::addLine(const char *str) { } else { Common::String format(str, 2); str += 2; - + + static Common::String asciiStr; + if (format[0] == 'A') { + bool useAscii = false; +#ifdef USE_TRANSLATION + // We could use TransMan.getCurrentCharset() but rather than compare strings + // it is easier to use TransMan.getCharsetMapping() (non null in case of non + // ISO-8859-1 mapping) + useAscii = (TransMan.getCharsetMapping() != NULL); +#endif + if (useAscii) + asciiStr = str; + return; + } StringArray wrappedLines; - g_gui.getFont().wordWrapText(str, _w - 2 * _xOff, wrappedLines); + if (!asciiStr.empty()) { + g_gui.getFont().wordWrapText(asciiStr, _w - 2 * _xOff, wrappedLines); + asciiStr.clear(); + } else + g_gui.getFont().wordWrapText(str, _w - 2 * _xOff, wrappedLines); for (StringArray::const_iterator i = wrappedLines.begin(); i != wrappedLines.end(); ++i) { _lines.push_back(format + *i); @@ -285,7 +304,7 @@ void AboutDialog::reflowLayout() { int maxW = _w - 2*_xOff; _w = 0; for (i = 0; i < ARRAYSIZE(credits); i++) { - int tmp = g_gui.getStringWidth(credits[i] + 5); + int tmp = g_gui.getStringWidth(credits[i]) + 5; if (_w < tmp && tmp <= maxW) { _w = tmp; } diff --git a/gui/browser.cpp b/gui/browser.cpp index 2b4f254156..84f2d0f747 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -32,7 +32,8 @@ namespace GUI { enum { kChooseCmd = 'Chos', - kGoUpCmd = 'GoUp' + kGoUpCmd = 'GoUp', + kHiddenCmd = 'Hidd' }; /* We want to use this as a general directory selector at some point... possible uses @@ -47,6 +48,7 @@ BrowserDialog::BrowserDialog(const char *title, bool dirBrowser) _isDirBrowser = dirBrowser; _fileList = NULL; _currentPath = NULL; + _showHidden = ConfMan.getBool("gui_browser_show_hidden", Common::ConfigManager::kApplicationDomain); // Headline - TODO: should be customizable during creation time new StaticTextWidget(this, "Browser.Headline", title); @@ -61,6 +63,9 @@ BrowserDialog::BrowserDialog(const char *title, bool dirBrowser) _backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain; + // Checkbox for the "show hidden files" state. + _showHiddenWidget = new CheckboxWidget(this, "Browser.Hidden", _("Show hidden files"), _("Show files marked with the hidden attribute"), kHiddenCmd); + // Buttons if (g_system->getOverlayWidth() > 320) new ButtonWidget(this, "Browser.Up", _("Go up"), _("Go to previous directory level"), kGoUpCmd); @@ -132,6 +137,15 @@ void BrowserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data if (data != (uint32)-1 && _isDirBrowser && !_nodeContent[data].isDirectory()) _fileList->setSelected(-1); break; + case kHiddenCmd: + // Update whether the user wants hidden files to be shown + _showHidden = _showHiddenWidget->getState(); + // We save the state in the application domain to avoid cluttering and + // to prevent odd behavior. + ConfMan.setBool("gui_browser_show_hidden", _showHidden, Common::ConfigManager::kApplicationDomain); + // Update the file listing + updateListing(); + break; default: Dialog::handleCommand(sender, cmd, data); } @@ -145,7 +159,7 @@ void BrowserDialog::updateListing() { ConfMan.set("browser_lastpath", _node.getPath()); // Read in the data from the file system - if (!_node.getChildren(_nodeContent, Common::FSNode::kListAll)) + if (!_node.getChildren(_nodeContent, Common::FSNode::kListAll, _showHidden)) _nodeContent.clear(); else Common::sort(_nodeContent.begin(), _nodeContent.end()); diff --git a/gui/browser.h b/gui/browser.h index 5cf091fbf4..7c098617bb 100644 --- a/gui/browser.h +++ b/gui/browser.h @@ -29,6 +29,7 @@ namespace GUI { class ListWidget; class StaticTextWidget; +class CheckboxWidget; class CommandSender; class BrowserDialog : public Dialog { @@ -40,6 +41,7 @@ public: virtual int runModal(); #else virtual void open(); + virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); #endif @@ -54,6 +56,8 @@ protected: StaticTextWidget *_currentPath; Common::FSNode _node; Common::FSList _nodeContent; + bool _showHidden; + CheckboxWidget *_showHiddenWidget; #endif Common::FSNode _choice; bool _isDirBrowser; diff --git a/gui/credits.h b/gui/credits.h index 237d97d56c..42e515dd70 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -6,6 +6,7 @@ static const char *credits[] = { "C0""Eugene Sandulenko", "", "C1""PR Office", +"A0""Arnaud Boutonne", "C0""Arnaud Boutonn\351", "C2""Public Relations Officer, Project Administrator", "C0""Eugene Sandulenko", @@ -26,6 +27,7 @@ static const char *credits[] = { "", "C1""Engine Teams", "C1""SCUMM", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""James Brown", "C2""(retired)", @@ -66,6 +68,7 @@ static const char *credits[] = { "C2""(retired)", "", "C1""AGOS", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""Paul Gilbert", "C0""Travis Howell", @@ -75,6 +78,7 @@ static const char *credits[] = { "C2""(retired)", "", "C1""CGE", +"A0""Arnaud Boutonne", "C0""Arnaud Boutonn\351", "C0""Paul Gilbert", "", @@ -104,6 +108,7 @@ static const char *credits[] = { "C0""Pawel Kolodziejski", "", "C1""DreamWeb", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""Bertrand Augereau", "C0""Filippos Karapetis", @@ -112,7 +117,9 @@ static const char *credits[] = { "C0""Willem Jan Palenstijn", "", "C1""Gob", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", +"A0""Arnaud Boutonne", "C0""Arnaud Boutonn\351", "C0""Sven Hesse", "C0""Eugene Sandulenko", @@ -123,11 +130,13 @@ static const char *credits[] = { "C0""Jordi Vilalta Prat", "", "C1""Hugo", +"A0""Arnaud Boutonne", "C0""Arnaud Boutonn\351", "C0""Oystein Eftevaag", "C0""Eugene Sandulenko", "", "C1""Kyra", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C2""VQA Player", "C0""Oystein Eftevaag", @@ -170,6 +179,7 @@ static const char *credits[] = { "C0""Joost Peters", "", "C1""SAGA", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""Daniel Balsom", "C2""Original engine reimplementation author (retired)", @@ -191,6 +201,7 @@ static const char *credits[] = { "C0""Lars Skovlund", "", "C1""Sky", +"A0""Robert Goeffringmann", "C0""Robert G\366ffringmann", "C2""(retired)", "C0""Oliver Kiehl", @@ -202,10 +213,12 @@ static const char *credits[] = { "C2""PSX version support", "C0""Thierry Crozat", "C2""Mac version support", +"A0""Robert Goeffringmann", "C0""Robert G\366ffringmann", "C2""(retired)", "", "C1""Sword2", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""Fabio Battaglia", "C2""PSX version support", @@ -213,6 +226,7 @@ static const char *credits[] = { "C2""(retired)", "", "C1""Sword25", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""Paul Gilbert", "C0""Max Horn", @@ -227,6 +241,7 @@ static const char *credits[] = { "C2""(retired)", "", "C1""Tinsel", +"A0""Torbjorn Andersson", "C0""Torbj\366rn Andersson", "C0""Fabio Battaglia", "C2""PSX version support", @@ -242,6 +257,7 @@ static const char *credits[] = { "C0""Filippos Karapetis", "", "C1""Tony", +"A0""Arnaud Boutonne", "C0""Arnaud Boutonn\351", "C0""Paul Gilbert", "C0""Alyssa Milburn", @@ -249,11 +265,13 @@ static const char *credits[] = { "C1""Toon", "C0""Sylvain Dupont", "", +"A1""Touche", "C1""Touch\351", "C0""Gregory Montoir", "C2""(retired)", "", "C1""TsAGE", +"A0""Arnaud Boutonne", "C0""Arnaud Boutonn\351", "C0""Paul Gilbert", "", @@ -262,6 +280,7 @@ static const char *credits[] = { "C2""(retired)", "", "C1""Wintermute", +"A0""Einar Johan T. Somaaen", "C0""Einar Johan T. S\370m\345en", "", "", @@ -309,6 +328,7 @@ static const char *credits[] = { "C2""(retired)", "", "C1""PlayStation 2", +"A0""Robert Goeffringmann", "C0""Robert G\366ffringmann", "C2""(retired)", "C0""Max Lingua", @@ -417,9 +437,11 @@ static const char *credits[] = { "", "C1""Packages", "C1""AmigaOS 4", +"A0""Hans-Joerg Frieden", "C0""Hans-J\366rg Frieden", "C2""(retired)", "C0""Hubert Maier", +"A0""Juha Niemimaki", "C0""Juha Niemim\344ki", "C2""(retired)", "", @@ -449,6 +471,7 @@ static const char *credits[] = { "", "C1""MorphOS", "C0""Fabien Coeurjoly", +"A0""Ruediger Hanke", "C0""R\374diger Hanke", "C2""(retired)", "", @@ -486,6 +509,7 @@ static const char *credits[] = { "C0""Jordi Vilalta Prat", "", "C1""Czech", +"A0""Zbynik Schwarz", "C0""Zbyn\354k Schwarz", "", "C1""Danish", @@ -512,10 +536,13 @@ static const char *credits[] = { "C1""Italian", "C0""Matteo Angelino", "", +"A1""Norwegian (Bokmaal)", "C1""Norwegian (Bokm\345l)", +"A0""Einar Johan Somaaen", "C0""Einar Johan S\370m\345en", "", "C1""Norwegian (Nynorsk)", +"A0""Einar Johan Somaaen", "C0""Einar Johan S\370m\345en", "", "C1""Polish", @@ -528,6 +555,7 @@ static const char *credits[] = { "C0""Eugene Sandulenko", "", "C1""Spanish", +"A0""Tomas Maidagan", "C0""Tom\341s Maidagan", "C0""Jordi Vilalta Prat", "", @@ -539,6 +567,7 @@ static const char *credits[] = { "", "", "C1""Websites (design)", +"A0""Dobo Balazs", "C0""Dob\363 Bal\341zs", "C2""Website design", "C0""William Claydon", @@ -567,6 +596,7 @@ static const char *credits[] = { "C2""Sound support for C64 version of MM/Zak, Loom PCE support", "C0""Janne Huttunen", "C2""V3 actor mask support, Dig/FT SMUSH audio", +"A0""Kovacs Endre Janos", "C0""Kov\341cs Endre J\341nos", "C2""Several fixes for Simon1", "C0""Jeroen Janssen", @@ -591,12 +621,14 @@ static const char *credits[] = { "C2""Sound support for Amiga SCUMM V2/V3 games, MM NES support", "C0""Robert Crossfield", "C2""Improved support for Apple II/C64 versions of MM", +"A0""Andreas Roever", "C0""Andreas R\366ver", "C2""Broken Sword I & II MPEG2 cutscene support", "C0""Edward Rudd", "C2""Fixes for playing MP3 versions of MI1/Loom audio", "C0""Daniel Schepler", "C2""Final MI1 CD music support, initial Ogg Vorbis support", +"A0""Andre Souza", "C0""Andr\351 Souza", "C2""SDL-based OpenGL renderer", "C0""Tom Frost", @@ -713,6 +745,7 @@ static const char *credits[] = { "C2""For deep tech details about C64 Zak & MM", "C0""Sarien Team", "C2""Original AGI engine code", +"A0""Jimmi Thogersen", "C0""Jimmi Th\370gersen", "C2""For ScummRev, and much obscure code/documentation", "C0""Tristan", diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 972163df6f..35627dd584 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -554,4 +554,4 @@ bool Debugger::debuggerCompletionCallback(GUI::ConsoleDialog *console, const cha #endif -} // End of namespace GUI +} // End of namespace GUI diff --git a/gui/debugger.h b/gui/debugger.h index 3a587d2723..b79e8723c1 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -207,6 +207,6 @@ public: }; -} // End of namespace GUI +} // End of namespace GUI #endif diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 0f4867ced5..4e35b54db8 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -1128,7 +1128,7 @@ void LauncherDialog::reflowLayout() { if (g_gui.xmlEval()->getVar("Globals.ShowLauncherLogo") == 1 && g_gui.theme()->supportsImages()) { StaticTextWidget *ver = (StaticTextWidget *)findWidget("Launcher.Version"); if (ver) { - ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter)); + ver->setAlign(g_gui.xmlEval()->getWidgetTextHAlign("Launcher.Version")); ver->setLabel(gScummVMVersionDate); } @@ -1139,7 +1139,7 @@ void LauncherDialog::reflowLayout() { } else { StaticTextWidget *ver = (StaticTextWidget *)findWidget("Launcher.Version"); if (ver) { - ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter)); + ver->setAlign(g_gui.xmlEval()->getWidgetTextHAlign("Launcher.Version")); ver->setLabel(gScummVMFullVersion); } diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 78c04f14c6..6d8e6baac7 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -683,6 +683,7 @@ "<layout type='vertical' center='true' padding='6,6,2,2'> " "<widget name='Version' " "height='Globals.Line.Height' " +"textalign='center' " "/> " "<layout type='horizontal' spacing='5' padding='0,0,0,0'> " "<widget name='SearchDesc' " @@ -740,7 +741,11 @@ "height='Globals.Line.Height' " "/> " "<widget name='List'/> " -"<layout type='horizontal' padding='0,0,8,0'> " +"<layout type='vertical' padding='0,0,8,0'> " +"<widget name='Hidden' " +"type='Checkbox' " +"/> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='Up' " "type='Button' " "/> " @@ -753,6 +758,7 @@ "/> " "</layout> " "</layout> " +"</layout> " "</dialog> " "<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> " "<layout type='vertical' padding='0,0,0,0'> " @@ -1810,6 +1816,7 @@ "<layout type='vertical' center='true' padding='16,16,8,8'> " "<widget name='Version' " "height='Globals.Line.Height' " +"textalign='center' " "/> " "<layout type='horizontal' spacing='5' padding='10,0,0,0'> " "<widget name='SearchDesc' " @@ -1868,7 +1875,11 @@ "height='Globals.Line.Height' " "/> " "<widget name='List'/> " -"<layout type='horizontal' padding='0,0,16,0'> " +"<layout type='vertical' padding='0,0,16,0'> " +"<widget name='Hidden' " +"type='Checkbox' " +"/> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='Up' " "type='Button' " "/> " @@ -1881,6 +1892,7 @@ "/> " "</layout> " "</layout> " +"</layout> " "</dialog> " "<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> " "<layout type='vertical' padding='0,0,0,0'> " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 3183417db9..297ff20344 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC index 36eaacd168..8f40cb2a7e 100644 --- a/gui/themes/scummclassic/THEMERC +++ b/gui/themes/scummclassic/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.19:ScummVM Classic Theme:No Author] +[SCUMMVM_STX0.8.20:ScummVM Classic Theme:No Author] diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 312a90e78f..180e8fba74 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -107,6 +107,7 @@ <layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'> <widget name = 'Version' height = 'Globals.Line.Height' + textalign = 'center' /> <layout type = 'horizontal' spacing = '5' padding = '10, 0, 0, 0'> <widget name = 'SearchDesc' @@ -166,17 +167,22 @@ height = 'Globals.Line.Height' /> <widget name = 'List'/> - <layout type = 'horizontal' padding = '0, 0, 16, 0'> - <widget name = 'Up' - type = 'Button' - /> - <space/> - <widget name = 'Cancel' - type = 'Button' - /> - <widget name = 'Choose' - type = 'Button' + <layout type = 'vertical' padding = '0, 0, 16, 0'> + <widget name = 'Hidden' + type = 'Checkbox' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'Up' + type = 'Button' + /> + <space/> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Choose' + type = 'Button' + /> + </layout> </layout> </layout> </dialog> diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index d42efb5aa4..8bb03dea17 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -105,6 +105,7 @@ <layout type = 'vertical' center = 'true' padding = '6, 6, 2, 2'> <widget name = 'Version' height = 'Globals.Line.Height' + textalign = 'center' /> <layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'> <widget name = 'SearchDesc' @@ -163,18 +164,22 @@ height = 'Globals.Line.Height' /> <widget name = 'List'/> - <layout type = 'horizontal' padding = '0, 0, 8, 0'> - <widget name = 'Up' - type = 'Button' - /> - <space/> - <widget name = 'Cancel' - type = 'Button' - /> - - <widget name = 'Choose' - type = 'Button' + <layout type = 'vertical' padding = '0, 0, 8, 0'> + <widget name = 'Hidden' + type = 'Checkbox' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'Up' + type = 'Button' + /> + <space/> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Choose' + type = 'Button' + /> + </layout> </layout> </layout> </dialog> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 412ed6a96f..dbd84992e6 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index 9e8776263b..f4304622cb 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.19:ScummVM Modern Theme:No Author] +[SCUMMVM_STX0.8.20:ScummVM Modern Theme:No Author] diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index fa57e62c54..49c13cf1b0 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -180,17 +180,22 @@ height = 'Globals.Line.Height' /> <widget name = 'List'/> - <layout type = 'horizontal' padding = '0, 0, 16, 0'> - <widget name = 'Up' - type = 'Button' - /> - <space/> - <widget name = 'Cancel' - type = 'Button' - /> - <widget name = 'Choose' - type = 'Button' + <layout type = 'vertical' padding = '0, 0, 16, 0'> + <widget name = 'Hidden' + type = 'Checkbox' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'Up' + type = 'Button' + /> + <space/> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Choose' + type = 'Button' + /> + </layout> </layout> </layout> </dialog> diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 5c3cc8357e..9658402f82 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -103,6 +103,7 @@ <layout type = 'vertical' center = 'true' padding = '4, 4, 2, 2' spacing = '2'> <widget name = 'Version' height = 'Globals.Line.Height' + textalign = 'center' /> <layout type = 'horizontal' spacing = '5' padding = '0, 0, 2, 2'> <widget name = 'SearchDesc' @@ -161,18 +162,22 @@ height = 'Globals.Line.Height' /> <widget name = 'List'/> - <layout type = 'horizontal' padding = '0, 0, 8, 0'> - <widget name = 'Up' - type = 'Button' - /> - <space/> - <widget name = 'Cancel' - type = 'Button' - /> - - <widget name = 'Choose' - type = 'Button' + <layout type = 'vertical' padding = '0, 0, 8, 0'> + <widget name = 'Hidden' + type = 'Checkbox' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'Up' + type = 'Button' + /> + <space/> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Choose' + type = 'Button' + /> + </layout> </layout> </layout> </dialog> diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex 9b9b7bbea6..6812aaaf86 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/po/POTFILES b/po/POTFILES index 3d9b993d47..4389904e29 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -61,6 +61,7 @@ engines/tinsel/saveload.cpp engines/toltecs/detection.cpp engines/toltecs/menu.cpp engines/parallaction/saveload.cpp +engines/pegasus/pegasus.cpp audio/fmopl.cpp audio/mididrv.cpp diff --git a/po/be_BY.po b/po/be_BY.po index 3d64a3f55f..98fccad13f 100644 --- a/po/be_BY.po +++ b/po/be_BY.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-08-12 14:57+0200\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-12-12 22:02+0300\n" "Last-Translator: Ivan Lukyanov <greencis@mail.ru>\n" "Language-Team: Ivan Lukyanov <greencis@mail.ru>\n" @@ -32,32 +32,42 @@ msgstr "Уключаныя ў білд опцыі:" msgid "Available engines:" msgstr "Даступныя рухавічкі:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Паказаць / Прыбраць кансоль" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Уверх" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Перайсці на дырэкторыю ўзроўнем вышэй" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Уверх" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 -#: gui/saveload-dialog.cpp:207 gui/saveload-dialog.cpp:267 -#: gui/saveload-dialog.cpp:516 gui/saveload-dialog.cpp:843 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:865 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 +#: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 +#: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Адмена" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Абраць" @@ -72,15 +82,15 @@ msgstr "Закрыць" msgid "Mouse click" msgstr "Клік мышшу" -#: gui/gui-manager.cpp:122 base/main.cpp:300 +#: gui/gui-manager.cpp:122 base/main.cpp:301 msgid "Display keyboard" msgstr "Паказаць клавіятуру" -#: gui/gui-manager.cpp:126 base/main.cpp:304 +#: gui/gui-manager.cpp:126 base/main.cpp:305 msgid "Remap keys" msgstr "Перапрызначыць клавішы" -#: gui/gui-manager.cpp:129 base/main.cpp:307 +#: gui/gui-manager.cpp:129 base/main.cpp:308 msgid "Toggle FullScreen" msgstr "Пераключэнне на ўвесь экран" @@ -93,17 +103,18 @@ msgid "Map" msgstr "Прызначыць" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:844 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1775 -#: engines/agos/animation.cpp:561 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:539 engines/sword1/animation.cpp:560 -#: engines/sword1/animation.cpp:570 engines/sword1/animation.cpp:577 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:435 engines/sword2/animation.cpp:455 -#: engines/sword2/animation.cpp:465 engines/sword2/animation.cpp:474 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -175,8 +186,8 @@ msgid "" msgstr "" "Мова гульні. Змена гэтай налады не ператворыць ангельскую гульню ў рускую" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<па змаўчанні>" @@ -198,11 +209,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Рухавічок" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "Грф" @@ -215,7 +226,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перакрыць глабальныя налады графікі" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Аўдыё" @@ -228,11 +239,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перакрыць глабальныя налады аўдыё" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Гучнасць" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Гучн" @@ -246,7 +257,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перакрыць глабальныя налады гучнасці" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -259,7 +270,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перакрыць глабальныя налады MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -272,11 +283,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перакрыць глабальныя налады MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Шляхі" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Шляхі" @@ -290,7 +301,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Дзе гульня:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Дад. шлях:" @@ -298,42 +309,42 @@ msgstr "Дад. шлях:" msgid "Specifies path to additional data used the game" msgstr "Паказвае шлях да дадатковых файлаў, дадзеных для гульні" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Дад. шлях:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Захаванні гульняў:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Паказвае шлях да захаванняў гульні" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях зах:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Не зададзены" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Па змаўчанні" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Абярыце SoundFont" @@ -357,7 +368,7 @@ msgstr "Гэты ID гульні ўжо выкарыстоўваецца. Калі ласка, абярыце іншы." msgid "~Q~uit" msgstr "~В~ыхад" -#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:95 msgid "Quit ScummVM" msgstr "Завяршыць ScummVM" @@ -365,7 +376,7 @@ msgstr "Завяршыць ScummVM" msgid "A~b~out..." msgstr "Пра п~р~аграму..." -#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:69 msgid "About ScummVM" msgstr "Пра праграму ScummVM" @@ -532,133 +543,133 @@ msgstr "Прагледжана %d дырэкторый ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Знойдзена %d новых гульняў, прапушчана %d раней дададзеных гульняў ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Ніколі" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "кожныя 5 хвілін" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "кожныя 10 хвілін" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "кожныя 15 хвілін" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "кожныя 30 хвілін" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Не зададзены" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Не атрымалася ўжыць змены некаторых графічных налад:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "відэарэжым не можа быць зменены." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "поўнаэкранны рэжым не можа быць зменены" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "рэжым карэктыроўкі суадносін бакоў не можа быць зменены" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Граф. рэжым:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Рэжым растру:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Спецыяльныя рэжымы рэндэрынгу, падтрымоўваныя некаторымі гульнямі" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Поўнаэкранны рэжым" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Карэкцыя суадносін бакоў" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Карэктаваць суадносіны бакоў для гульняў з рэзалюцыяй 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Упадабанае:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Гукавая прылада:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Зазначае ўпадабаную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Зазначае выходную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Упадабанае:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Гук. прылада:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Эмулятар AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "Гукавая карта AdLib выкарыстоўваецца многімі гульнямі" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Чашчыня гуку:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -666,64 +677,68 @@ msgstr "" "Большыя значэнні задаюць лепшую якасць гуку, аднак яны могуць не " "падтрымлівацца вашай гукавой картай" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Прылада GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Зазначае выходную гукавую прыладу для MIDI" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Не выкарыстоўваць музыку для General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Выкарыстоўваць першую даступную прыладу" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont'ы падтрымліваюцца некаторымі гукавымі картамі, Fluidsynth ды " "Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Змешаны рэжым AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Выкарыстоўваць і MIDI, і AdLib для генерацыі гуку" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Узмацненне MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Нал. MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Паказвае гукавую прыладу па змаўчанні для вываду на Roland MT-32/LAPC1/CM32l/" "CM64" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Сапраўдны Roland MT-32 (забараніць эмуляцыю GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -731,194 +746,195 @@ msgstr "" "Адзначце, калі ў вас падключана Roland-сумяшчальная гукавая прылада і вы " "жадаеце яе выкарыстоўваць" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Сапраўдны Roland MT-32 (забараніць GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Уключыць рэжым Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Сапраўдны Roland MT-32 (забараніць эмуляцыю GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Выключае супастаўленне General MIDI для гульняў з гукавой дарожкай для " "Roland MT-32" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Не выкарыстоўваць музыку для MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Агучка" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Субтытры" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Абое" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Агуч" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Абое" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Паказваць субтытры і прайграваць гаворку" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Выкл. усё" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Гучнасць SFX:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Гучнасць спецыяльных гукавых эфектаў" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. SFX:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Шлях да тэм:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Дзе тэмы:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Паказвае шлях да дадатковых файлаў дадзеных, выкарыстоўваных усімі гульнямі, " "або ScummVM" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Рознае" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Рознае" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Тэма" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Малявалка GUI:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Аўтазахаванне:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Аўтазах.:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Клавішы" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Мова GUI:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Мова графічнага інтэрфейсу ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы павінны перазапусціць ScummVM, каб ужыць змены." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Абярыце дырэкторыю для захаванняў" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не магу пісаць у абраную дырэкторыю. Калі ласка, азначце іншую." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Абярыце дырэкторыю для тэм GUI" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Абярыце дырэкторыю з дадатковымі файламі" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Абярыце дырэкторыю з плагінамі" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -926,71 +942,71 @@ msgstr "" "Тэма, абраная вамі, не падтрымлівае бягучую мову. Калі вы жадаеце " "выкарыстоўваць гэтую тэму, вам неабходна спачатку пераключыцца на іншую мову." -#: gui/saveload-dialog.cpp:158 +#: gui/saveload-dialog.cpp:166 msgid "List view" msgstr "Выгляд спісу" -#: gui/saveload-dialog.cpp:159 +#: gui/saveload-dialog.cpp:167 msgid "Grid view" msgstr "Выгляд сеткі" -#: gui/saveload-dialog.cpp:202 gui/saveload-dialog.cpp:350 +#: gui/saveload-dialog.cpp:210 gui/saveload-dialog.cpp:358 msgid "No date saved" msgstr "Дата не запісана" -#: gui/saveload-dialog.cpp:203 gui/saveload-dialog.cpp:351 +#: gui/saveload-dialog.cpp:211 gui/saveload-dialog.cpp:359 msgid "No time saved" msgstr "Час не запісаны" -#: gui/saveload-dialog.cpp:204 gui/saveload-dialog.cpp:352 +#: gui/saveload-dialog.cpp:212 gui/saveload-dialog.cpp:360 msgid "No playtime saved" msgstr "Час гульні не запісаны" -#: gui/saveload-dialog.cpp:211 gui/saveload-dialog.cpp:267 +#: gui/saveload-dialog.cpp:219 gui/saveload-dialog.cpp:275 msgid "Delete" msgstr "Выдаліць" -#: gui/saveload-dialog.cpp:266 +#: gui/saveload-dialog.cpp:274 msgid "Do you really want to delete this savegame?" msgstr "Вы сапраўды жадаеце выдаліць гэта захаванне?" -#: gui/saveload-dialog.cpp:375 gui/saveload-dialog.cpp:796 +#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:872 msgid "Date: " msgstr "Дата: " -#: gui/saveload-dialog.cpp:379 gui/saveload-dialog.cpp:802 +#: gui/saveload-dialog.cpp:387 gui/saveload-dialog.cpp:878 msgid "Time: " msgstr "Час: " -#: gui/saveload-dialog.cpp:385 gui/saveload-dialog.cpp:810 +#: gui/saveload-dialog.cpp:393 gui/saveload-dialog.cpp:886 msgid "Playtime: " msgstr "Час гульні: " -#: gui/saveload-dialog.cpp:398 gui/saveload-dialog.cpp:465 +#: gui/saveload-dialog.cpp:406 gui/saveload-dialog.cpp:494 msgid "Untitled savestate" msgstr "Захаванне без імя" -#: gui/saveload-dialog.cpp:517 +#: gui/saveload-dialog.cpp:546 msgid "Next" msgstr "Наступны" -#: gui/saveload-dialog.cpp:520 +#: gui/saveload-dialog.cpp:549 msgid "Prev" msgstr "Папярэдні" -#: gui/saveload-dialog.cpp:684 +#: gui/saveload-dialog.cpp:736 msgid "New Save" msgstr "Новае захаванне" -#: gui/saveload-dialog.cpp:684 +#: gui/saveload-dialog.cpp:736 msgid "Create a new save game" msgstr "Стварыць новы запіс гульні" -#: gui/saveload-dialog.cpp:789 +#: gui/saveload-dialog.cpp:865 msgid "Name: " msgstr "Назва: " -#: gui/saveload-dialog.cpp:861 +#: gui/saveload-dialog.cpp:937 #, c-format msgid "Enter a description for slot %d:" msgstr "Увядзіце апісанне слота %d:" @@ -1028,35 +1044,35 @@ msgstr "Растарызатар са згладжваннем (16bpp)" msgid "Clear value" msgstr "Ачысціць значэнне" -#: base/main.cpp:209 +#: base/main.cpp:210 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Рухавічок не падтрымлівае ўзровень адладкі '%s'" -#: base/main.cpp:287 +#: base/main.cpp:288 msgid "Menu" msgstr "Меню" -#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:291 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:293 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:294 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Паўза" -#: base/main.cpp:296 +#: base/main.cpp:297 msgid "Skip line" msgstr "Прапусціць радок" -#: base/main.cpp:467 +#: base/main.cpp:468 msgid "Error running game:" msgstr "Памылка запуску гульні:" -#: base/main.cpp:491 +#: base/main.cpp:492 msgid "Could not find any engine capable of running the selected game" msgstr "Не магу знайсці рухавічок для запуску абранай гульні" @@ -1172,13 +1188,15 @@ msgid "~R~eturn to Launcher" msgstr "~У~ галоўнае меню" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Захаваць гульню:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1208,12 +1226,12 @@ msgstr "" "дапамогу." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~О~К" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~А~дмена" @@ -1221,23 +1239,23 @@ msgstr "~А~дмена" msgid "~K~eys" msgstr "~К~лавішы" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Не магу ініцыялізаваць фармат колеру." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Не атрымалася пераключыць відэарэжым: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Не атрымалася выкарыстаць карэкцыю суадносін бакоў." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Не магу ўжыць поўнаэкранны рэжым." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1251,7 +1269,7 @@ msgstr "" "на жорсткі дыск. Падрабязнасці можна знайсці ў\n" "файле README." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1266,7 +1284,7 @@ msgstr "" "з'явіцца музыка. Падрабязнасці можна знайсці ў\n" "файле README." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1276,7 +1294,7 @@ msgstr "" "README за базавай інфармацыяй, а таксама інструкцыямі пра тое, як атрымаць " "далейшую дапамогу." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1286,30 +1304,52 @@ msgstr "" "ScummVM цалкам. Яна, хутчэй за ўсё, не будзе працаваць стабільна, і " "захаванні гульняў могуць не працаваць у будучых версіях ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Усё адно запусціць" -#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:390 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Выкарыстоўваць арыгінальныя экраны запісу/чытанні гульні" -#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:391 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Выкарыстоўваць арыгінальныя экраны запісу і захаванні гульні замест " "зробленых у ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Узнавіць гульню:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Узнавіць" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM выявіў у вас захаванні гульні Broken Sword 1 у старым фармаце.\n" +"Стары фармат больш не падтрымліваецца, і, каб загрузіць захаванні, яны " +"павінны быць пераведзены ў новы фармат.\n" +"\n" +"Націсніце ОК, каб перавесці іх у новы фармат зараз, у адваротным выпадку " +"гэта паведамленне з'явіцца зноў пры наступным запуску гульні.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Выкарыстоўваць рэжым яркай палітры" @@ -1318,27 +1358,27 @@ msgstr "Выкарыстоўваць рэжым яркай палітры" msgid "Display graphics using the game's bright palette" msgstr "Малюе графіку з выкарыстаннем яркай палітры гульні" -#: engines/sci/detection.cpp:370 +#: engines/sci/detection.cpp:373 msgid "EGA undithering" msgstr "EGA без растру" -#: engines/sci/detection.cpp:371 +#: engines/sci/detection.cpp:374 msgid "Enable undithering in EGA games" msgstr "Уключае рэжым без растравання ў EGA гульнях" -#: engines/sci/detection.cpp:380 +#: engines/sci/detection.cpp:383 msgid "Prefer digital sound effects" msgstr "Аддаваць перавагу лічбавым гукавым эфектам" -#: engines/sci/detection.cpp:381 +#: engines/sci/detection.cpp:384 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Аддаваць перавагу лічбавым гукавым эфектам замест сінтэзаваных" -#: engines/sci/detection.cpp:400 +#: engines/sci/detection.cpp:403 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Выкарыстоўваць IMF/Yamaha FB-01 для вываду MIDI" -#: engines/sci/detection.cpp:401 +#: engines/sci/detection.cpp:404 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -1346,32 +1386,32 @@ msgstr "" "Выкарыстоўваць гукавую карту IBM Music Feature ці модуль сінтэзу Yamaha " "FB-01 FM для MIDI" -#: engines/sci/detection.cpp:411 +#: engines/sci/detection.cpp:414 msgid "Use CD audio" msgstr "Выкарыстоўваць CD аўдыё" -#: engines/sci/detection.cpp:412 +#: engines/sci/detection.cpp:415 msgid "Use CD audio instead of in-game audio, if available" msgstr "" "Выкарыстоўваць гукавыя дарожкі з CD замест музыкі з файлаў гульні (калі " "даступна)" -#: engines/sci/detection.cpp:422 +#: engines/sci/detection.cpp:425 msgid "Use Windows cursors" msgstr "Выкарыстоўваць курсоры Windows" -#: engines/sci/detection.cpp:423 +#: engines/sci/detection.cpp:426 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Выкарыстоўваць курсоры Windows (меншыя па памеры і аднакаляровыя) замест " "курсораў DOS" -#: engines/sci/detection.cpp:433 +#: engines/sci/detection.cpp:436 msgid "Use silver cursors" msgstr "Выкарыстоўваць срэбныя курсоры" -#: engines/sci/detection.cpp:434 +#: engines/sci/detection.cpp:437 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -2024,7 +2064,7 @@ msgstr "Ляцець направа" msgid "Fly to lower right" msgstr "Ляцець направа-ўніз" -#: engines/scumm/scumm.cpp:1773 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2033,7 +2073,7 @@ msgstr "" "Рэжым \"роднага\" MIDI патрабуе абнаўленне Roland Upgrade ад\n" "LucasArts, але не хапае %s. Пераключаюся на AdLib." -#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2044,7 +2084,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2285 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2055,7 +2095,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2297 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2066,7 +2106,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2512 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2077,7 +2117,7 @@ msgstr "" "затым абярыце дырэкторыю Maniac у дырэкторыі з гульнёй Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Рэжым хуткага пераходу актываваны" @@ -2098,11 +2138,11 @@ msgstr "Показать карту" msgid "~M~ain Menu" msgstr "Галоўнае меню" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Эфекты вады ўключаны" -#: engines/agos/animation.cpp:560 +#: engines/agos/animation.cpp:557 #, c-format msgid "Cutscene file '%s' not found!" msgstr "Файл застаўкі '%s' не знойдзены!" @@ -2120,6 +2160,15 @@ msgstr "Не атрымалася захаваць гульню ў файл." msgid "Failed to delete file." msgstr "Не атрымалася выдаліць файл." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Хуткі рэжым" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Не атрымалася захаваць гульню" @@ -2230,7 +2279,7 @@ msgstr "Опцыі" msgid "Choose Spell" msgstr "Абраць загавор" -#: engines/kyra/sound_midi.cpp:475 +#: engines/kyra/sound_midi.cpp:477 msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2277,26 +2326,26 @@ msgstr "Уступ з дыскет" msgid "Use the floppy version's intro (CD version only)" msgstr "Выкарыстоўваць уступ з гнуткіх дыскаў (толькі для CD версіі гульні)" -#: engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:519 #, c-format msgid "PSX stream cutscene '%s' cannot be played in paletted mode" msgstr "Застаўка PSX '%s' не можа быць прайграна ў рэжыме з палітрай" -#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 +#: engines/sword1/animation.cpp:540 engines/sword2/animation.cpp:439 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Знойдзены застаўкі ў фармаце DXA, але ScummVM быў сабраны без падтрымкі zlib" -#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 +#: engines/sword1/animation.cpp:550 engines/sword2/animation.cpp:449 msgid "MPEG2 cutscenes are no longer supported" msgstr "Застаўкі ў фармаце MPEG2 больш не падтрымліваюцца" -#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 +#: engines/sword1/animation.cpp:556 engines/sword2/animation.cpp:457 #, c-format msgid "Cutscene '%s' not found" msgstr "Застаўка '%s' не знойдзена" -#: engines/sword1/control.cpp:863 +#: engines/sword1/control.cpp:865 msgid "" "ScummVM found that you have old savefiles for Broken Sword 1 that should be " "converted.\n" @@ -2313,7 +2362,7 @@ msgstr "" "Націсніце ОК, каб перавесці іх у новы фармат зараз, у адваротным выпадку " "гэта паведамленне з'явіцца зноў пры наступным запуску гульні.\n" -#: engines/sword1/control.cpp:1232 +#: engines/sword1/control.cpp:1234 #, c-format msgid "" "Target new save game already exists!\n" @@ -2322,11 +2371,11 @@ msgstr "" "Захаванне гульні з такім імем ужо існуе!\n" "Вы жадаеце пакінуць старую назву (%s) ці зрабіць новую (%s)?\n" -#: engines/sword1/control.cpp:1235 +#: engines/sword1/control.cpp:1237 msgid "Keep the old one" msgstr "Пакінуць старое" -#: engines/sword1/control.cpp:1235 +#: engines/sword1/control.cpp:1237 msgid "Keep the new one" msgstr "Зрабіць новае" @@ -2334,7 +2383,7 @@ msgstr "Зрабіць новае" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Гэта завяршэнне дэма Broken Sword 1" -#: engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:419 msgid "" "PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" @@ -2349,13 +2398,13 @@ msgstr "Паказваць назвы аб'ектаў" msgid "Show labels for objects on mouse hover" msgstr "Паказвае назвы аб'ектаў пры навядзенні курсора мышы" -#: engines/teenagent/resources.cpp:68 +#: engines/teenagent/resources.cpp:94 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" msgstr "" "У вас адсутнічае файл 'teenagent.dat'. Запампуйце яго з вэб-сайта ScummVM" -#: engines/teenagent/resources.cpp:89 +#: engines/teenagent/resources.cpp:115 msgid "" "The teenagent.dat file is compressed and zlib hasn't been included in this " "executable. Please decompress it" @@ -2469,7 +2518,7 @@ msgstr "Без музыкі" msgid "Amiga Audio Emulator" msgstr "Эмулятар гуку Amiga" -#: audio/softsynth/adlib.cpp:1593 +#: audio/softsynth/adlib.cpp:2284 msgid "AdLib Emulator" msgstr "Эмулятар AdLib" @@ -2481,11 +2530,11 @@ msgstr "Эмулятар Apple II GS (адсутнічае)" msgid "C64 Audio Emulator" msgstr "Эмулятар гуку C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Наладжваю эмулятар MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Эмулятар MT-32" @@ -2636,24 +2685,24 @@ msgstr "Сярэдняя пстрычка" msgid "Right Click" msgstr "Правая пстрычка" -#: backends/platform/sdl/macosx/appmenu_osx.mm:78 +#: backends/platform/sdl/macosx/appmenu_osx.mm:77 msgid "Hide ScummVM" msgstr "Схаваць ScummVM" -#: backends/platform/sdl/macosx/appmenu_osx.mm:83 +#: backends/platform/sdl/macosx/appmenu_osx.mm:82 msgid "Hide Others" msgstr "Схаваць астатнія" -#: backends/platform/sdl/macosx/appmenu_osx.mm:88 +#: backends/platform/sdl/macosx/appmenu_osx.mm:87 msgid "Show All" msgstr "Паказаць усё" -#: backends/platform/sdl/macosx/appmenu_osx.mm:110 -#: backends/platform/sdl/macosx/appmenu_osx.mm:121 +#: backends/platform/sdl/macosx/appmenu_osx.mm:109 +#: backends/platform/sdl/macosx/appmenu_osx.mm:120 msgid "Window" msgstr "Акно" -#: backends/platform/sdl/macosx/appmenu_osx.mm:115 +#: backends/platform/sdl/macosx/appmenu_osx.mm:114 msgid "Minimize" msgstr "Прыбраць у Dock" @@ -2667,12 +2716,12 @@ msgid "Normal (no scaling)" msgstr "Без павелічэння" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Карэкцыя суадносін бакоў уключана" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Карэкцыя суадносін бакоў выключана" @@ -2681,7 +2730,7 @@ msgid "Active graphics filter:" msgstr "Актыўны графічны фільтр:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Аконны рэжым" @@ -2705,11 +2754,11 @@ msgstr "Бягучы відэарэжым" msgid "Current scale" msgstr "Бягучы маштаб" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Актыўны рэжым фільтра: Лінейны" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Актыўны рэжым фільтра: Найблізкі" @@ -3035,19 +3084,19 @@ msgstr "Вы сапраўды жадаеце выйсці?" #: backends/events/gph/gph-events.cpp:386 #: backends/events/gph/gph-events.cpp:429 -#: backends/events/openpandora/op-events.cpp:139 +#: backends/events/openpandora/op-events.cpp:168 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "Рэжым 'дотыкаў' тачскрына - Левы клік" #: backends/events/gph/gph-events.cpp:388 #: backends/events/gph/gph-events.cpp:431 -#: backends/events/openpandora/op-events.cpp:141 +#: backends/events/openpandora/op-events.cpp:170 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "Рэжым 'дотыкаў' тачскрына - Правы клік" #: backends/events/gph/gph-events.cpp:390 #: backends/events/gph/gph-events.cpp:433 -#: backends/events/openpandora/op-events.cpp:143 +#: backends/events/openpandora/op-events.cpp:172 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "Рэжым 'дотыкаў' тачскрына - Пралёт (без кліку)" @@ -3067,7 +3116,12 @@ msgstr "Мінімальная гучнасць" msgid "Decreasing Volume" msgstr "Памяншэнне гучнасці" -#: backends/updates/macosx/macosx-updates.mm:65 +#: backends/events/openpandora/op-events.cpp:174 +#, fuzzy +msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)" +msgstr "Рэжым 'дотыкаў' тачскрына - Пралёт (без кліку)" + +#: backends/updates/macosx/macosx-updates.mm:67 msgid "Check for Updates..." msgstr "Правяраю абнаўленні..." @@ -3103,6 +3157,9 @@ msgstr "Пстрычкі ўключаны" msgid "Clicking Disabled" msgstr "Пстрычкі выключаны" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Уключыць рэжым Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules Зелёный" diff --git a/po/ca_ES.po b/po/ca_ES.po index 706eb64edb..63f9bbdf7a 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-08-26 20:32+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" @@ -29,32 +29,42 @@ msgstr "Caracterэstiques compilades:" msgid "Available engines:" msgstr "Motors disponibles:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Mostra / Oculta la consola" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Amunt" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Torna al nivell de directoris anterior" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Amunt" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "CancelЗla" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Escull" @@ -90,17 +100,18 @@ msgid "Map" msgstr "Assigna" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "D'acord" @@ -173,8 +184,8 @@ msgstr "" "Idioma del joc. Aixђ no convertirр la vostra versiѓ Espanyola del joc a " "Anglшs" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<per defecte>" @@ -196,11 +207,11 @@ msgstr "Platafor.:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grрfics" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -213,7 +224,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Canviar les opcions de grрfics" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Рudio" @@ -226,11 +237,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Canviar les opcions d'рudio" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -244,7 +255,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Canviar les opcions de volum" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -257,7 +268,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Canviar les opcions de MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -270,11 +281,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Canviar les opcions de MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Camins" @@ -288,7 +299,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camэ joc:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Camэ extra:" @@ -296,42 +307,42 @@ msgstr "Camэ extra:" msgid "Specifies path to additional data used the game" msgstr "Especifica el camэ de dades addicionals utilitzades pel joc" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Camэ de partides:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Especifica on es desaran les partides" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Partides:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Cap" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Per defecte" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Seleccioneu el fitxer SoundFont" @@ -535,133 +546,133 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "S'han trobat %d jocs nous, s'han ignorat %d jocs afegits anteriorment ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Mai" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "cada 5 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "cada 10 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "cada 15 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "cada 30 minuts" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Cap" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "No s'han pogut aplicar alguns canvis de les opcions grрfiques:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "no s'ha pogut canviar el mode de vэdeo" -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "no s'ha pogut canviar l'ajust de pantalla completa" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "no s'ha pogut canviar l'ajust de la correcciѓ d'aspecte" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Mode grрfic:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Mode de pintat:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Modes de tramat especials suportats per alguns jocs" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Mode pantalla completa" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Disp. preferit:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 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:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 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:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferit:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib s'utilitza per la mњsica de molts jocs" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Freq. sortida:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -669,63 +680,67 @@ 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:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Dispositiu GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 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:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "No utilitzis mњsica General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Utilitza el primer dispositiu disponible" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "Fitxer SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "Algunes targes de so, Fluidsynth i Timidity suporten SoundFont" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Mode combinat AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Guany MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -733,196 +748,197 @@ msgstr "" "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so " "compatible amb Roland connectat al vostre ordinador" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Activa el Mode Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "No utilitzis mњsica de Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Veus" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Subtэtols" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Velocitat de subt.:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Veus" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Mostra els subtэtols i reprodueix la veu" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Veloc. de subt.:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Silenciar tot" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volum dels sons d'efectes especials" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Camэ dels temes:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Camэ temes:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Camэ dels connectors:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camэ de connectors:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Pintat GUI:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Desat automрtic:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-desat:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Tecles" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Idioma GUI:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfэcie d'usuari de ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Heu de reiniciar ScummVM perquш tots els canvis tinguin efecte." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Seleccioneu el directori de les partides desades" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Seleccioneu el directori dels temes" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Seleccioneu el directori dels fitxers extra" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Seleccioneu el directori dels connectors" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1176,13 +1192,15 @@ msgid "~R~eturn to Launcher" msgstr "~R~etorna al Llanчador" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Desa la partida:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1210,12 +1228,12 @@ msgstr "" "informaciѓ bрsica i les instruccions sobre com obtenir mщs assistшncia." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~D~'acord" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~C~ancelЗla" @@ -1223,23 +1241,23 @@ msgstr "~C~ancelЗla" msgid "~K~eys" msgstr "~T~ecles" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "No s'ha pogut iniciar el format de color." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "No s'ha pogut canviar al mode de vэdeo: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "No s'ha pogut aplicar la configuraciѓ de la relaciѓ d'aspecte." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "No s'ha pogut aplicar l'ajust de pantalla completa." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1253,7 +1271,7 @@ msgstr "" "els fitxers de dades al disc dur.\n" "Consulteu el fitxer README per a mщs detalls." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1267,7 +1285,7 @@ msgstr "" "tal de poder sentir la mњsica del joc.\n" "Consulteu el fitxer README per a mщs detalls." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1276,7 +1294,7 @@ msgstr "" "No s'ha pogut carregar la partida (%s)! Consulteu el fitxer README per a la " "informaciѓ bрsica i les instruccions sobre com obtenir mщs assistшncia." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1286,29 +1304,52 @@ msgstr "" "pel ScummVM. Com a tal, probablement serр inestable, i pot ser que les " "partides que deseu no funcionin en versions futures de ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Inicia de totes maneres" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Utilitza les pantalles originals de desat/cрrrega" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utilitza les pantalles originals de desat/cрrrega, en lloc de les de ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Recupera la partida:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Restaura" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"El ScummVM ha trobat que teniu partides desades antigues de Broken Sword 1 " +"que s'haurien de convertir.\n" +"El format de les partides desades antigues no estр suportat, per la qual " +"cosa no podreu carregar aquestes partides si no les convertiu.\n" +"\n" +"Premeu D'Acord per convertir-les ara, en cas contrari se us tornarр a " +"demanar la propera vegada que engegueu el joc.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Utilitza el mode de paleta brillant" @@ -2023,7 +2064,7 @@ msgstr "Vola a la dreta" msgid "Fly to lower right" msgstr "Vola avall i a la dreta" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2032,7 +2073,7 @@ msgstr "" "El suport de MIDI natiu requereix l'actualitzaciѓ Roland de LucasArts,\n" "perђ no s'ha trobat %s. S'utilitzarр AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2043,7 +2084,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2054,7 +2095,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2065,7 +2106,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2076,7 +2117,7 @@ msgstr "" "seleccioneu el directori 'Maniac' de dins del directori del joc Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Mode ~Z~ip activat" @@ -2097,7 +2138,7 @@ msgstr "~M~ostra el mapa" msgid "~M~ain Menu" msgstr "~M~enњ Principal" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~E~fecte de l'aigua activat" @@ -2119,6 +2160,15 @@ msgstr "No s'ha pogut desar l'estat del joc al fitxer." msgid "Failed to delete file." msgstr "No s'ha pogut esborrar el fitxer." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Mode rрpid" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "No s'ha pogut desar l'estat del joc" @@ -2482,11 +2532,11 @@ msgstr "Emulador d'Apple II GS (NO IMPLEMENTAT)" msgid "C64 Audio Emulator" msgstr "Emulador d'рudio C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Iniciant l'Emulador de MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" @@ -2668,12 +2718,12 @@ msgid "Normal (no scaling)" msgstr "Normal (no escalat)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "S'ha activat la correcciѓ de la relaciѓ d'aspecte" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "S'ha desactivat la correcciѓ de la relaciѓ d'aspecte" @@ -2682,7 +2732,7 @@ msgid "Active graphics filter:" msgstr "Filtre de grрfics actiu:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Mode de finestra" @@ -2706,11 +2756,11 @@ msgstr "Mode de vэdeo actual" msgid "Current scale" msgstr "Escala actual" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Mode de filtre actiu: Lineal" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Mode de filtre actiu: Prђxim" @@ -3108,3 +3158,6 @@ msgstr "Clicat activat" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Disabled" msgstr "Clicat desactivat" + +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Activa el Mode Roland GS" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 5b1dc7ec52..c9d7901481 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-08 18:03+0100\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" @@ -33,32 +33,42 @@ msgstr "Zakompilovanщ funkce:" msgid "Available engines:" msgstr "Dostupnс jсdra:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Ukсzat / Skr§t konzoli" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Jэt nahoru" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Jэt na pјedchozэ њroveђ adresсјe" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Jэt nahoru" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "ZruЙit" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Zvolit" @@ -94,17 +104,18 @@ msgid "Map" msgstr "Mapovat" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -175,8 +186,8 @@ msgid "" "English" msgstr "Jazyk hry. Toto z VaЙэ Љpanьlskщ verze neudьlс Anglickou" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<v§chozэ>" @@ -198,11 +209,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Jсdro" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Obraz" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -215,7 +226,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Zvuk" @@ -228,11 +239,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Hlasitost" @@ -246,7 +257,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -259,7 +270,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -272,11 +283,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Cesty" @@ -290,7 +301,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Dodateшnс Cesta:" @@ -298,42 +309,42 @@ msgstr "Dodateшnс Cesta:" msgid "Specifies path to additional data used the game" msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Stanovuje, kam jsou umэstьny vaЙe uloОenщ hry" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ўсdnщ" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "V§chozэ" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Vybrat SoundFont" @@ -532,133 +543,133 @@ msgstr "Prohledсno %d adresсјљ..." 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:84 msgid "Never" msgstr "Nikdy" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "KaОd§ch 5 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "KaОd§ch 10 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "KaОd§ch 15 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "KaОd§ch 30 min" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ўсdnщ" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "reОim obrazu nemohl b§t zmьnьn." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "ReОim obrazu:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "ReОim vykreslenэ:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "ReОim celщ obrazovky" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Korekce pomьru stran" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Korigovat pomьr stran pro hry 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Prioritnэ Zaјэzenэ:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Prioritnэ Zaј.:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib emulсtor" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "V§stup. frekvence:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -666,62 +677,66 @@ msgstr "" "VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi " "zvukovou kartou" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM Zaјэzenэ:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "NepouОэvat hudbu General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "PouОэt prvnэ dostupnщ zaјэzenэ" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "SmэЙen§ reОim AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "PouОэt obь zvukovщ generace MIDI a AdLib" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Zesэlenэ MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Zaјэzenэ MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -729,190 +744,191 @@ 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:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Zapnout reОim Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "NepouОэvat hudbu Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Text a иeш" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "иeш" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Titulky" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Oba" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "иeш" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Titl" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Zobrazit titulky a pјehrсvat јeш" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Rychlost titulkљ" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Ztlumit VЙe" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Hlasitost speciсlnэch zvukov§ch efektљ" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Vzhled:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI Vykreslovaш:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Klсvesy" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Jazyk GUI" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Jazyk GUI ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 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:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Vybrat adresсј pro uloОenщ hry" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Vyberte adresсј pro vhledy GUI" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Vyberte adresсј pro dodateшnщ soubory" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Vyberte adresсј pro zсsuvnщ moduly" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1168,13 +1184,15 @@ msgid "~R~eturn to Launcher" msgstr "~N~сvrat do SpouЙtьшe" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "UloОit hru:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1203,12 +1221,12 @@ msgstr "" "informace a pokyny k zэskсnэ dalЙэ podpory." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~Z~ruЙit" @@ -1216,23 +1234,23 @@ msgstr "~Z~ruЙit" msgid "~K~eys" msgstr "~K~lсvesy" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Nelze zavщst barevn§ formсt." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Nelze pјepnout na reОim obrazu: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Nelze pouОэt nastavenэ pomьru stran." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Nelze pouОэt nastavenэ celщ obrazovky." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1246,7 +1264,7 @@ msgstr "" "datovщ soubory na VсЙ pevn§ disk.\n" "Pro podrobnosti si pјeшtьte README." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1260,7 +1278,7 @@ msgstr "" "abyste mohli poslouchat hudbu ve hјe.\n" "Pro podrobnosti si pјeшtьte README." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1269,7 +1287,7 @@ msgstr "" "Naшtenэ stavu hry selhalo (%s)! Prosэm pјeшtьte si dokumentaci pro zсkladnэ " "informace a pokyny k zэskсnэ dalЙэ podpory." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1279,28 +1297,51 @@ msgstr "" "ScummVM. Proto je moОnщ, Оe bude nestabilnэ a jakщkoli uloОenщ hry nemusэ " "fungovat v budoucэch verzэch ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Pјesto spustit" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ mэsto ze ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Obnovit hru" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Obnovit" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM zjistil, Оe mсte starщ uloОenщ pozice pro Broken Sword 1, kterщ by " +"mьly b§t pјevedeny.\n" +"Star§ formсt uloОen§ch her jiО nenэ podporovсn, takОe pokud je nepјevedete, " +"nebudete moci vaЙe hry naшэst.\n" +"\n" +"Stisknьte OK, abyste je pјevedli teя, jinak budete poОсdсni znovu, pјi " +"spuЙtьnэ tщto hry.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "PouОэt reОim jasnщ palety" @@ -2010,7 +2051,7 @@ msgstr "Letьt doprava" msgid "Fly to lower right" msgstr "Letьt doprava dolљ" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2019,7 +2060,7 @@ msgstr "" "Pјirozenс podpora MIDI vyОaduje Aktualizaci Roland od LucasArts,\n" "ale %s chybэ. Mэsto toho je pouОit AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2030,7 +2071,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2041,7 +2082,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2052,7 +2093,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2063,7 +2104,7 @@ msgstr "" "vyberte adresсј 'Maniac' uvnitј hernэho adresсјe Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~R~eОim SviЙtьnэ Aktivovсn" @@ -2084,7 +2125,7 @@ msgstr "~Z~obrazit Mapu" msgid "~M~ain Menu" msgstr "~H~lavnэ Menu" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~E~fekt Vody Zapnut" @@ -2106,6 +2147,15 @@ msgstr "Nelze uloОit stav hry do souboru." msgid "Failed to delete file." msgstr "Nelze smazat soubor." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Rychl§ reОim" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Nelze uloОit hru." @@ -2462,11 +2512,11 @@ msgstr "Apple II GS Emulсtor (NENЭ ZAVEDEN)" msgid "C64 Audio Emulator" msgstr "Emulсtor zvuku C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Zavсdэm MT-32 Emulсtor" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 Emulсtor" @@ -2648,12 +2698,12 @@ msgid "Normal (no scaling)" msgstr "Normсlnэ (bez zmьny velikosti)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Povolena korekce pomьru stran" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Zakсzсna korekce pomьru stran" @@ -2662,7 +2712,7 @@ msgid "Active graphics filter:" msgstr "Aktivnэ grafick§ filtr:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "ReОim do okna" @@ -2686,11 +2736,11 @@ msgstr "Souшasn§ reОim obrazu" msgid "Current scale" msgstr "Souшasnс velikost" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktivnэ reОim filtru: Lineсrnэ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktivnэ reОim filtru: NejbliОЙэ" @@ -3091,6 +3141,9 @@ msgstr "Kliknutэ Povoleno" msgid "Clicking Disabled" msgstr "Kliknutэ Zakсzсno" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Zapnout reОim Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules Zelenс" diff --git a/po/da_DA.po b/po/da_DA.po index 1e1a491990..558a09ba31 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-09 20:27+0100\n" "Last-Translator: Steffen Nyeland <steffen@nyeland.dk>\n" "Language-Team: Steffen Nyeland <steffen@nyeland.dk>\n" @@ -32,32 +32,42 @@ msgstr "Funktioner kompileret ind:" msgid "Available engines:" msgstr "Tilgцngelige \"motorer\":" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Vis / Skjul konsol" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Gх op" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Gх til forrige biblioteks niveau" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Gх op" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Fortryd" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vцlg" @@ -93,17 +103,18 @@ msgid "Map" msgstr "Kortlцg" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -176,8 +187,8 @@ msgstr "" "Spillets sprog. Dette vil ikke цndre din spanske version af spillet til " "engelsk" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" @@ -199,11 +210,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -216,7 +227,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Lyd" @@ -229,11 +240,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" @@ -247,7 +258,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -260,7 +271,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -273,11 +284,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Stier" @@ -291,7 +302,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Ekstra sti:" @@ -299,42 +310,42 @@ msgstr "Ekstra sti:" msgid "Specifies path to additional data used the game" msgstr "Angiver sti til ekstra data der bruges i spillet" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Gemme sti:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Gemme sti:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Vцlg SoundFont" @@ -534,133 +545,133 @@ msgstr "Gennemset %d biblioteker ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Fundet %d nye spil, ignorer %d tidligere tilfјjede spil ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "hvert 5. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "hvert 10. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "hvert 15. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "hvert 30. minut" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Anvendelse af цndringer for grafiske indstillinger fejlede:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "videotilstanden kunne ikke цndres." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "fuld skцrm indstillingen kunne ikke цndres" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "billedformat indstillingen ikke kunne цndres" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafik tilstand:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understјttet a nogle spil" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Fuldskцrms tilstand" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Billedformat korrektion" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrekt billedformat til 320x200 spil" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Foretruk. enhed:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretruk. enh.:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -668,60 +679,64 @@ msgstr "" "Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit " "lydkort" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM enhed:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Angiver standard lyd enhed for Generel MIDI-udgang" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Brug ikke Generel MIDI musik" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Brug fјrste tilgцngelig enhed" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Blandet AdLib/MIDI tilstand" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Brug bхde MIDI og AdLib lyd generering" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI lydstyrke:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32 enhed:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -729,190 +744,191 @@ msgstr "" "Kontroller om du vil bruge din rigtige hardware Roland-kompatible lyd enhed " "tilsluttet til din computer" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Цgte Roland MT-32 (ingen GM emulering)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Aktivщr Roland GS tilstand" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Sluk for Generel MIDI kortlцgning for spil med Roland MT-32 lydspor" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Brug ikke Roland MT-32 musik" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Begge" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Vis undertekster og afspil tale" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Mute alle" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI renderer:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Sprog:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du skal genstarte ScummVM fјr dine цndringer har effekt." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Vцlg bibliotek til gemmer" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Vцlg bibliotek for GUI temaer" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Vцlg bibliotek for plugins" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1169,13 +1185,15 @@ msgid "~R~eturn to Launcher" msgstr "~R~etur til oversigt" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Gemmer:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1204,12 +1222,12 @@ msgstr "" "oplysninger, og for at fх instruktioner om, hvordan man fхr yderligere hjцlp." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~F~ortryd" @@ -1217,23 +1235,23 @@ msgstr "~F~ortryd" msgid "~K~eys" msgstr "~T~aster" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Kunne ikke initialisere farveformat." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Kunne ikke skifte til videotilstand: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Kunne ikke anvende billedformat korrektion indstilling." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Kunne ikke anvende fuldskцrm indstilling." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1247,7 +1265,7 @@ msgstr "" "datafiler til din harddisk i stedet.\n" "Se README fil for detaljer." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1261,7 +1279,7 @@ msgstr "" "for at lytte til spillets musik.\n" "Se README fil for detaljer." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1271,7 +1289,7 @@ msgstr "" "grundlцggende oplysninger, og for at fх instruktioner om, hvordan man fхr " "yderligere hjцlp." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1281,28 +1299,51 @@ msgstr "" "ScummVM. Sхledes, er det sandsynligt, at det er ustabilt, og alle gemmer du " "foretager fungerer muligvis ikke i fremtidige versioner af ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Start alligevel" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Brug original gem/indlцs skцrme" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Brug de originale gem/indlцs skцrme, istedet for dem fra ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Gendan spil:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Gendan" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM har konstateret, at du har gamle gemmer for Broken Sword 1, der skal " +"konverteres.\n" +"Det gamle gemte spil format understјttes ikke lцngere, sх vil du ikke vцre i " +"stand til at indlцse dine spil, hvis du ikke konvertere dem.\n" +"\n" +"Tryk pх OK for at konvertere dem nu, ellers vil du blive spurgt igen, nцste " +"gang du starter spillet.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Brug lys palet tilstand" @@ -2013,7 +2054,7 @@ msgstr "Flyv til hјjre" msgid "Fly to lower right" msgstr "Flyv nederst til hјjre" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2022,7 +2063,7 @@ msgstr "" "Indbygget MIDI understјttelse krцver Roland opgradering fra LucasArts,\n" "men %s mangler. Bruger AdLib i stedet." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2033,7 +2074,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2044,7 +2085,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2055,7 +2096,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2066,7 +2107,7 @@ msgstr "" "vцlg 'Maniac' mappen inde i Tentacle spillets mappe." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~ip tilstand aktiveret" @@ -2087,7 +2128,7 @@ msgstr "Vi~s~ kort" msgid "~M~ain Menu" msgstr "Hoved~m~enu" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~V~andeffekter aktiveret" @@ -2109,6 +2150,15 @@ msgstr "Mislykkedes at gemme spil tilstand til fil." msgid "Failed to delete file." msgstr "Mislykkedes at slette fil." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Hurtig tilstand" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Mislykkedes at gemme spil" @@ -2466,11 +2516,11 @@ msgstr "Apple II GS emulator (IKKE IMPLEMENTERET)" msgid "C64 Audio Emulator" msgstr "C64 lyd emulator" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Initialisere MT-32 emulator" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 emulator" @@ -2652,12 +2702,12 @@ msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Aktivщr billedformat korrektion" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Deaktivщr billedformat korrektion" @@ -2666,7 +2716,7 @@ msgid "Active graphics filter:" msgstr "Aktive grafik filtre:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Vindue tilstand" @@ -2690,11 +2740,11 @@ msgstr "Aktuel videotilstand" msgid "Current scale" msgstr "Aktuel skalering" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktiv filter tilstand: Linцr" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktiv filter tilstand: Nцrmest" @@ -3094,6 +3144,9 @@ msgstr "Klik aktiveret" msgid "Clicking Disabled" msgstr "Klik deaktiveret" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Aktivщr Roland GS tilstand" + #~ msgid "Hercules Green" #~ msgstr "Hercules grјn" diff --git a/po/de_DE.po b/po/de_DE.po index f164a9b76d..f376718841 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-14 22:49+0100\n" "Last-Translator: Simon Sawatzki <SimSaw@gmx.de>\n" "Language-Team: Simon Sawatzki <SimSaw@gmx.de> (Lead), Lothar Serra Mari " @@ -31,32 +31,42 @@ msgstr "Verwendete Funktionen:" msgid "Available engines:" msgstr "Verfќgbare Spiele-Engines:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Konsole zeigen/verbergen" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Pfad hoch" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Zu hіherer Pfadebene wechseln" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Pfad hoch" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Abbrechen" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Auswфhlen" @@ -92,17 +102,18 @@ msgid "Map" msgstr "Zuweisen" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -175,8 +186,8 @@ msgstr "" "Sprache des Spiels. Diese Funktion wird nicht eine spanische Version des " "Spiels in eine deutsche verwandeln." -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<Standard>" @@ -198,11 +209,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Engine" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -215,7 +226,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globale Grafikeinstellungen ќbergehen" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Audio" @@ -228,11 +239,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globale Audioeinstellungen ќbergehen" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Lautstфrke" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Lautst." @@ -246,7 +257,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globale Lautstфrkeeinstellungen ќbergehen" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -259,7 +270,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -272,11 +283,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Pfade" @@ -290,7 +301,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Extrapfad:" @@ -298,42 +309,42 @@ msgstr "Extrapfad:" msgid "Specifies path to additional data used the game" msgstr "Legt das Verzeichnis fќr zusфtzliche Spieldateien fest." -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Extrapfad:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Spielstфnde:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Legt fest, wo die Spielstфnde abgelegt werden." -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Speichern:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Keiner" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "SoundFont auswфhlen" @@ -535,136 +546,136 @@ msgstr "%d Ordner durchsucht..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d neue Spiele gefunden, %d bereits hinzugefќgte Spiele ignoriert..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Niemals" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "alle 5 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "alle 10 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "alle 15 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "alle 30 Minuten" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "-" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Fehler bei einigen Фnderungen in Grafikoptionen:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "Grafikmodus konnte nicht geфndert werden." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "Vollbildeinstellung konnte nicht geфndert werden." -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "" "Einstellung fќr Seitenverhфltniskorrektur konnte nicht geфndert werden." -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafikmodus:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Render-Modus:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "" "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt." -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Vollbildmodus" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Seitenverhфltnis korrigieren" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib-Emulator" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet." -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Ausgabefrequenz:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -672,64 +683,68 @@ msgstr "" "Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise " "nicht von jeder Soundkarte unterstќtzt." -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM-Gerфt:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 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:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Keine General-MIDI-Musik" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Erstes verfќgbares Gerфt" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib-/MIDI-Modus" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Benutzt MIDI und AdLib zur Sounderzeugung." -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI-Lautstфrke:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32-Gerфt:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Echte Roland-MT-32-Emulation (GM-Emulation deaktiviert)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -737,197 +752,198 @@ 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:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland-MT-32-Emulation (kein GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Roland-GS-Modus" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Echte Roland-MT-32-Emulation (GM-Emulation deaktiviert)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Keine Roland-MT-32-Musik" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Sprache und Text:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Sprache" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Untertitel" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Beides" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Untertitel-Tempo:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Sprache + Text:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Spr." -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Text" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "S+T" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Untertitel anzeigen und Sprachausgabe aktivieren" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Text-Tempo:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Alles aus" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Effektlautstфrke:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Lautstфrke spezieller Soundeffekte" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Effektlautst.:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Sprachlautstфrke:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Sprachlautst.:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Themenpfad:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Themenpfad:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Plugin-Pfad:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin-Pfad:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Sonstiges" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Andere" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI-Renderer:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autom. Speichern:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Speich.(auto)" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Tasten" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Sprache:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Sprache der ScummVM-Oberflфche" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Sie mќssen ScummVM neu starten, damit die Фnderungen wirksam werden." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Verzeichnis fќr Oberflфchen-Themen" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 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:1450 +#: gui/options.cpp:1468 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." @@ -1188,13 +1204,15 @@ msgid "~R~eturn to Launcher" msgstr "Zur Spiele~l~iste" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Speichern:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1222,12 +1240,12 @@ msgstr "" "Datei fќr grundlegende Informationen und Anweisungen zu weiterer Hilfe." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~A~bbrechen" @@ -1235,23 +1253,23 @@ msgstr "~A~bbrechen" msgid "~K~eys" msgstr "~T~asten" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Konnte Farbenformat nicht initialisieren." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Konnte nicht zu Grafikmodus wechseln: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Konnte Einstellung fќr Seitenverhфltniskorrektur nicht anwenden." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Konnte Einstellung fќr Vollbildmodus nicht anwenden." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1267,7 +1285,7 @@ msgstr "" "Lesen Sie die Liesmich-Datei fќr\n" "weitere Informationen." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1282,7 +1300,7 @@ msgstr "" "Spiel hіren zu kіnnen. Lesen Sie die\n" "Liesmich-Datei fќr weitere Informationen." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1291,7 +1309,7 @@ msgstr "" "Laden des Spielstands %s fehlgeschlagen! Bitte lesen Sie die Liesmich-Datei " "fќr grundlegende Informationen und Anweisungen zu weiterer Hilfe." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1302,29 +1320,52 @@ msgstr "" "und jegliche Spielstфnde, die Sie erstellen, kіnnten in zukќnftigen " "Versionen von ScummVM nicht mehr funktionieren." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Trotzdem starten" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Originale Spielstand-Menќs" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Verwendet die originalen Menќs zum Speichern und Laden statt der von ScummVM." -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Spiel laden:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Laden" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM hat erkannt, dass Sie alte Spielstфnde von Baphomets Fluch 1 haben, " +"die umgewandelt werden sollten.\n" +"Das alte Speicherformat wird nicht mehr unterstќtzt, also kіnnen Sie diese " +"Spielstфnde unkonvertiert nicht laden.\n" +"\n" +"Klicken Sie auf OK, um diese jetzt umzuwandeln, sonst werden Sie erneut " +"gefragt, wenn Sie nфchstes Mal dieses Spiel starten.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Modus fќr helle Palette verwenden" @@ -2038,7 +2079,7 @@ msgstr "Nach rechts fliegen" msgid "Fly to lower right" msgstr "Nach unten rechts fliegen" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2048,7 +2089,7 @@ msgstr "" "Roland-Upgrade von LucasArts, aber %s\n" "fehlt. Stattdessen wird AdLib verwendet." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2059,7 +2100,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2070,7 +2111,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2081,7 +2122,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2093,7 +2134,7 @@ msgstr "" "Verzeichnis dieses Spiels aus." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Schneller ~R~aumwechsel aktiviert" @@ -2114,7 +2155,7 @@ msgstr "~K~arte anzeigen" msgid "~M~ain Menu" msgstr "Haupt~m~enќ" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~W~assereffekt aktiviert" @@ -2136,6 +2177,15 @@ msgstr "Konnte Spielstand nicht in Datei speichern." msgid "Failed to delete file." msgstr "Konnte Datei nicht lіschen." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Schneller Modus" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Konnte Spielstand nicht speichern." @@ -2502,11 +2552,11 @@ msgstr "Apple-II-GS-Emulator (NICHT INTEGRIERT)" msgid "C64 Audio Emulator" msgstr "C64-Audio-Emulator" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "MT-32-Emulator wird gestartet" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32-Emulation" @@ -2688,12 +2738,12 @@ msgid "Normal (no scaling)" msgstr "Normal ohn.Skalieren" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Seitenverhфltniskorrektur an" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Seitenverhфltniskorrektur aus" @@ -2702,7 +2752,7 @@ msgid "Active graphics filter:" msgstr "Aktiver Grafikfilter:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Fenstermodus" @@ -2726,11 +2776,11 @@ msgstr "Aktueller Grafikmodus" msgid "Current scale" msgstr "Aktueller Vergrіпerungsfaktor" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktiver Filtermodus: linear" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktiver Filtermodus: nфchste Nachbarn" @@ -3131,6 +3181,9 @@ msgstr "Klicken aktiviert" msgid "Clicking Disabled" msgstr "Klicken deaktiviert" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Roland-GS-Modus" + #~ msgid "Hercules Green" #~ msgstr "Hercules-Grќn" diff --git a/po/es_ES.po b/po/es_ES.po index 0d38044824..7891f9cedc 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-08 18:19+0100\n" "Last-Translator: Tomсs Maidagan\n" "Language-Team: \n" @@ -29,32 +29,42 @@ msgstr "Caracterэsticas incluidas:" msgid "Available engines:" msgstr "Motores disponibles:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Mostrar / Ocultar consola" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Ir al directorio anterior" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Aceptar" @@ -90,17 +100,18 @@ msgid "Map" msgstr "Asignar" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "Aceptar" @@ -173,8 +184,8 @@ msgstr "" "Idioma del juego. No sirve para pasar al inglщs la versiѓn espaёola de un " "juego" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<por defecto>" @@ -196,11 +207,11 @@ msgstr "Plat.:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -213,7 +224,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Opciones grсficas especэficas" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Sonido" @@ -226,11 +237,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Opciones de sonido especэficas" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volumen" @@ -244,7 +255,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Opciones de volumen especэficas" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -257,7 +268,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Opciones de MIDI especэficas" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -270,11 +281,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Opciones de MT-32 especэficas" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Rutas" @@ -288,7 +299,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Adicional:" @@ -296,42 +307,42 @@ msgstr "Adicional:" msgid "Specifies path to additional data used the game" msgstr "Especifica un directorio para datos adicionales del juego" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Partidas:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Especifica dѓnde guardar tus partidas" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Partidas:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ninguna" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Por defecto" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Selecciona un SoundFont" @@ -531,136 +542,136 @@ msgstr "Se ha buscado en %d directorios..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d juegos nuevos encontrados. %d juegos ignorados (ya aёadidos)..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "cada 5 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "cada 10 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "cada 15 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "cada 30 minutos" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ninguno" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Fallo al aplicar algunos cambios en las opciones grсficas:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "no se ha podido cambiar el modo de vэdeo." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "no se ha podido cambiar el ajuste de pantalla completa" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "no se ha podido cambiar el ajuste de correcciѓn de aspecto" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Renderizado:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Modos especiales de expansiѓn compatibles con algunos juegos" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Correcciѓn de aspecto" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregir relaciѓn de aspecto en juegos 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Disp. preferido:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 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:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 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:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Emul. de AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib se usa para la mњsica en muchos juegos" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Frec. de salida:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -668,64 +679,68 @@ msgstr "" "Los valores mсs altos ofrecen mayor calidad, pero puede que tu tarjeta de " "sonido no sea compatible" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Especifica el dispositivo de salida General MIDI por defecto" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "No usar mњsica General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Utilizar el primer dispositivo disponible" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont es compatible con algunas tarjetas de sonido, con Fluidsynth y con " "Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Ganancia MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Disp. MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -733,191 +748,192 @@ msgstr "" "Marcar si se quiere usar un dispositivo de sonido real conectado al " "ordenador y compatible con Roland" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sin emulaciѓn GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Activar modo Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "No usar mњsica Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Voces" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Vel. de subtэtulos:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Reproducir voces y subtэtulos" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vel. de subt.:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Silenciar" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volumen de los efectos de sonido" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Interfaz:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Idioma:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfaz de ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Tienes que reiniciar ScummVM para aplicar los cambios." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Selecciona el directorio de guardado" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Selecciona el directorio de temas" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Selecciona el directorio adicional" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Selecciona el directorio de plugins" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1173,13 +1189,15 @@ msgid "~R~eturn to Launcher" msgstr "~V~olver al lanzador" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Guardar partida" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1209,12 +1227,12 @@ msgstr "" "obtener mсs ayuda." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~S~э" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~C~ancelar" @@ -1222,23 +1240,23 @@ msgstr "~C~ancelar" msgid "~K~eys" msgstr "~T~eclas" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "No se ha podido iniciar el formato de color." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "No se ha podido cambiar al modo de video: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "No se ha podido aplicar el ajuste de correcciѓn de aspecto" -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "No se ha podido aplicar el ajuste de pantalla completa." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1252,7 +1270,7 @@ msgstr "" "copiar los archivos del juego al disco duro.\n" "Consulta el archivo README para mсs detalles." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1266,7 +1284,7 @@ msgstr "" "poder escuchar la mњsica del juego.\n" "Consulta el archivo README para mсs detalles." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1276,7 +1294,7 @@ msgstr "" "README para encontrar informaciѓn bсsica e instrucciones sobre cѓmo obtener " "mсs ayuda." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1286,29 +1304,52 @@ msgstr "" "ScummVM. Por lo tanto, puede que sea inestable, y que las partidas que " "guardes no funcionen en versiones futuras de ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Jugar aun asэ" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Usar pantallas de guardar/cargar originales" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utilizar las pantallas de guardar/cargar originales, en vez de las de ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Cargar partida:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Cargar" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM ha detectado que tienes partidas guardadas antiguas de Broken Sword " +"1, que deben ser actualizadas.\n" +"El formato antiguo ya no es compatible, asэ que no podrсs cargar tus " +"partidos si no las actualizas.\n" +"\n" +"Pulsa Aceptar para actualizarlas, si no lo haces este mensaje volverс a " +"aparecer la prѓxima vez.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Usar paleta original" @@ -2020,7 +2061,7 @@ msgstr "Volar a la derecha" msgid "Fly to lower right" msgstr "Volar abajo y a la derecha" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2029,7 +2070,7 @@ msgstr "" "El soporte MIDI nativo requiere la actualizaciѓn Roland de LucasArts,\n" "pero %s no estс disponible. Se usarс AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2040,7 +2081,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2051,7 +2092,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2062,7 +2103,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2073,7 +2114,7 @@ msgstr "" "selecciona el directorio 'Maniac', dentro del directorio de DOTT." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Modo ~Z~ip activado" @@ -2094,7 +2135,7 @@ msgstr "~M~ostrar el mapa" msgid "~M~ain Menu" msgstr "~M~enњ principal" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Efecto ag~u~a activado" @@ -2116,6 +2157,15 @@ msgstr "Fallo al guardar el estado del juego en el archivo." msgid "Failed to delete file." msgstr "Fallo al borrar el archivo." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Modo rсpido" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Fallo al guardar la partida" @@ -2478,11 +2528,11 @@ msgstr "Emulador de Apple II GS (NO IMPLEMENTADO)" msgid "C64 Audio Emulator" msgstr "Emulador de C64 Audio" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Iniciando el emulador de MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" @@ -2664,12 +2714,12 @@ msgid "Normal (no scaling)" msgstr "Normal" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Activar la correcciѓn de aspecto" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Desactivar la correcciѓn de aspecto" @@ -2678,7 +2728,7 @@ msgid "Active graphics filter:" msgstr "Filtro de grсficos activo:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Modo ventana" @@ -2702,11 +2752,11 @@ msgstr "Modo de vэdeo actual" msgid "Current scale" msgstr "Escala actual" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Modo de filtro activo: lineal" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Modo de filtro activo: el mсs cercano" @@ -3106,6 +3156,9 @@ msgstr "Clic activado" msgid "Clicking Disabled" msgstr "Clic desactivado" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Activar modo Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules verde" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2011-12-15 14:53+0100\n" "Last-Translator: Mikel Iturbe Urretxa <mikel@hamahiru.org>\n" "Language-Team: Librezale <librezale@librezale.org>\n" @@ -29,32 +29,42 @@ msgstr "Ezaugarri erantsiak:" msgid "Available engines:" msgstr "Motore erabilgarriak:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Kontsola erakutsi / ezkutatu" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Joan gora" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Igo aurreko direktorio-mailara" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Joan gora" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Utzi" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Aukeratu" @@ -90,17 +100,18 @@ msgid "Map" msgstr "Esleitu" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "Ados" @@ -172,8 +183,8 @@ msgid "" msgstr "" "Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<lehenetsia>" @@ -196,11 +207,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Aztertu" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafikoak" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -213,7 +224,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ezarpen grafiko globalak baliogabetu" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Soinua" @@ -226,11 +237,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Soinu ezarpen globalak baliogabetu" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Bolumena" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Bolumena" @@ -244,7 +255,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Bolumen ezarpen globalak baliogabetu" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -257,7 +268,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "MIDI ezarpen globalak baliogabetu" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -270,11 +281,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "MT-32 ezarpen globalak baliogabetu" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Bide-izenak" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Bideak" @@ -288,7 +299,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jokoa:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Gehigarriak:" @@ -296,42 +307,42 @@ msgstr "Gehigarriak:" msgid "Specifies path to additional data used the game" msgstr "Jokoak erabiltzen duen datu gehigarrien bide-izena" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Gehigarria:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Partida gordeak:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Zure gordetako partidak non gordeko diren zehazten du" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Partida gordeak:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Bat ere ez" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Lehenetsia" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "SoundFont-a aukeratu" @@ -534,133 +545,133 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "%d joko berri aurkitu dira, aurretik gehituriko %d ez dira kontuan hartu" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Inoiz ez" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "5 minuturo" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "10 minuturo" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "15 minuturo" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "30 minuturo" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Bat ere ez" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Ezin izan da grafikoen aukeretako batzuk aplikatu:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "ezin izan da bideo-modua aldatu." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "ezin izan da pantaila-osoaren ezarpena aldatu" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "formatu-ratioaren ezarpena ezin izan da aldatu" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Modu grafikoa:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Renderizazioa:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Joko batzuk onarturiko lausotze-modu bereziak" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Pantaila osoa" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Formatu-ratioaren zuzenketa" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "320x200 jokoentzako formatu-ratioa zuzendu" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Gogoko gailua:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Irteerako soinu txartel edo emuladorea ezartzen du" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Gail. gogokoa:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib emuladorea:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib musikarako hainbat jokotan erabiltzen da" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Irteera maizt.:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -668,64 +679,68 @@ msgstr "" "Balio altuagoek soinu kalitate hobea ezartzen dute, baina baliteke zure " "soinu-txartela bateragarria ez izatea" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM gailua:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Ez erabili General MIDI musika" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Erabilgarri dagoen lehen gailua erabili" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "Zenbait soinu txartel bateragarriak dira SoundFont-ekin, Fluidsynth eta " "Timidity besteak beste" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib/MIDI modua" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Soinua sortzerakoan MIDI eta AdLib erabili" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI irabazia:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32 gailua:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Roland MT-32/LAPC1/CM32l/CM64 irteerarako defektuzko soinu txartela ezartzen " "du" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -733,192 +748,193 @@ msgstr "" "Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-" "gailua erabiltzeko" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Roland GS modua gaitu" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Roland MT-32 soinua duten jokoetan General MIDI bihurtzea desgaitzen du" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Ez erabili Roland MT-32 musika" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Ahotsa" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Azpitituluak" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Biak" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Azpitit. abiadura:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Ahots." -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Azp." -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Biak" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Azpit. abiadura:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Mututu dena" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Soinu efektu berezien bolumena" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Joko guztiek edo ScummVM-k darabilten datu gehigarrien bide-izena ezartzen du" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Beste" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Beste" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Gaia:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Interfazea:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Teklak" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Hizkuntza" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "ScummVM interfazearen hizkuntza" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "ScummVM berrabiarazi behar duzu aldaketak indarrean jartzeko" -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Gordetako partiden direktorioa aukeratu" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Aukeraturiko direktorioan ezin da idatzi. Mesedez, aukeratu beste bat." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Gaien direktorioa aukeratu" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Fitxategi gehigarrien direktorioa aukeratu" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Pluginen direktorioa aukeratu" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1174,13 +1190,15 @@ msgid "~R~eturn to Launcher" msgstr "It~z~uli abiarazlera" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Gorde jokoa:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1208,12 +1226,12 @@ msgstr "" "informaziorako eta laguntza gehiago nola jaso jakiteko." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~A~dos" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~U~tzi" @@ -1221,23 +1239,23 @@ msgstr "~U~tzi" msgid "~K~eys" msgstr "~T~eklak" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Kolore formatua ezin izan da hasieratu." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Ezin izan da aldatu bideo modura : '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Ezin izan da formatu-ratio ezarpena aplikatu." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Ezin izan da pantaila-osoa ezarpena aplikatu." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1251,7 +1269,7 @@ msgstr "" "fitxategiak disko gogorrera kopiatzea.\n" "Jo README fitxategira xehetasunetarako." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1265,7 +1283,7 @@ msgstr "" "izateko. Jo README fitxategira\n" "xehetasunetarako." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1274,7 +1292,7 @@ msgstr "" "Jokoaren egoera kargatzeak huts egin du (%s)! Jo ezazu README-ra oinarrizko " "informaziorako eta laguntza gehiago nola jaso jakiteko." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1284,28 +1302,51 @@ msgstr "" "Hori dela eta, ezegonkorra izan daiteke eta gerta daiteke gordeta izan " "ditzakezun partidan ez ibiltzea ScummVM-ren etorkizuneko bertsioetan." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Jolastu berdin-berdin" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Jokoa kargatu:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Kargatu" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM-k aurkitu du konbertitu beharko liratekeen Broken Sword 1-eko " +"partida gorde zaharrak dituzula.\n" +"Partida gordeen formatu zaharra ez da bateragarria jada, eta beraz ezingo " +"dituzu zure partidak kargatu ez badituzu formatu berrira pasatzen.\n" +"\n" +"Sakatu Ados orain konbertitzeko, bestela berriz galdetuko dizut jokoa berriz " +"martxan jartzen duzunean.\n" + #: engines/dreamweb/detection.cpp:57 #, fuzzy msgid "Use bright palette mode" @@ -2017,7 +2058,7 @@ msgstr "Eskuinera hegan egin" msgid "Fly to lower right" msgstr "Behera eta eskuinera hegan egin" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2026,7 +2067,7 @@ msgstr "" "MIDI euskarri natiboak LucasArts-en Roland eguneraketa behar du,\n" "baina %s ez dago eskuragarri. AdLib erabiliko da." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2037,7 +2078,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2048,7 +2089,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2059,7 +2100,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2070,7 +2111,7 @@ msgstr "" "aukeratu 'Maniac' direktorioa Tentacle-ren joko-direktorioaren barruan." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~ip modua aktibaturik" @@ -2091,7 +2132,7 @@ msgstr "~M~apa erakutsi" msgid "~M~ain Menu" msgstr "Menu ~n~agusia" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~U~r-efektua gaituta" @@ -2113,6 +2154,15 @@ msgstr "Ezin izan da jokoa fitxategira gorde." msgid "Failed to delete file." msgstr "Ezin izan da fitxategia ezabatu" +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Modu bizkorra" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Ezin izan da jokoa gorde" @@ -2475,11 +2525,11 @@ msgstr "Apple II GS emuladorea (INPLEMENTATU GABE)" msgid "C64 Audio Emulator" msgstr "C64 Audio emuladorea" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "MT-32 emuladorea hasieratzen" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 emuladorea" @@ -2661,12 +2711,12 @@ msgid "Normal (no scaling)" msgstr "Normala" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Formatu-ratio zuzenketa gaituta" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Formatu-ratio zuzenketa desgaituta" @@ -2675,7 +2725,7 @@ msgid "Active graphics filter:" msgstr "Filtro grafiko aktiboa:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Leiho modua" @@ -2699,11 +2749,11 @@ msgstr "Oraingo bideo-modua" msgid "Current scale" msgstr "Oraingo eskala" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Filtro aktibo modua: lineala" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Filtro aktibo modua: hurbilena" @@ -3103,6 +3153,9 @@ msgstr "Klikatzea gaituta" msgid "Clicking Disabled" msgstr "Klikatzea desgaituta" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Roland GS modua gaitu" + #~ msgid "Hercules Green" #~ msgstr "Herkules berdea" diff --git a/po/fi_FI.po b/po/fi_FI.po index d2fda71b7d..06551a13fa 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-12-01 19:37+0200\n" "Last-Translator: Toni Saarela <saarela@gmail.com>\n" "Language-Team: Finnish\n" @@ -30,32 +30,42 @@ msgstr "Tфhфn versioon kффnnetyt ominaisuudet:" msgid "Available engines:" msgstr "Tuetut pelimoottorit:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Nфytф / piilota konsoli" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Siirry ylіs" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Palaa edelliselle hakemistotasolle" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Siirry ylіs" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Peruuta" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Valitse" @@ -91,17 +101,18 @@ msgid "Map" msgstr "Nфppфinkartta" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "Tallenna" @@ -174,8 +185,8 @@ msgstr "" "Pelin kieli. Tфmф ei muuta esimerkiksi espanjankielistф versiota pelistф " "englanninkieliseksi." -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<oletus>" @@ -197,11 +208,11 @@ msgstr "Alusta:" msgid "Engine" msgstr "Moottori" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafiikka" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -214,7 +225,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ohita globaalit grafiikka-asetukset" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Ффni" @@ -227,11 +238,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ohita globaalit ффniasetukset" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Voimakkuus" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Voimakkuus" @@ -245,7 +256,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ohita globaalit ффnenvoimakkuusasetukset" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -258,7 +269,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ohita globaalit MIDI-asetukset" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -271,11 +282,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ohita globaalit MT-32 asetukset" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Polut" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Polut" @@ -289,7 +300,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pelin polku:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Lisфkansio:" @@ -297,42 +308,42 @@ msgstr "Lisфkansio:" msgid "Specifies path to additional data used the game" msgstr "Mффrittфф polun lisфtiedostoihin joita peli mahdollisesti kфyttфф" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Lisфkansio:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Mффrittфф polun pelitallennuksille" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ei mффritelty" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Oletus" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Valitse ффnifontti" @@ -535,135 +546,135 @@ msgstr "" "%d uutta peliф lіytyi, jфtettiin %d peliф huomiotta, koska ne oli jo lisфtty " "aiemmin." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Ei koskaan" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "5 minuutin vфlein" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "10 minuutin vфlein" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "15 minuutin vфlein" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "30 minuutin vфlein" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ei kфytіssф" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Joitain grafiikka-asetuksia ei saatu asetettua:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "videotilaa ei voitu vaihtaa." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "kokoruututilaa ei voitu muuttaa" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "kuvasuhdekorjausasetusta ei voitu muuttaa" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafiikkatila:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Renderіintitila:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Erityiset dithering asetukset joita jotkut pelit tukevat" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Kokoruututila" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Kuvasuhteen korjaus" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Oikea kuvasuhde 320x200 peleille" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Ensisijainen laite:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Mффrittфф ффnilaitteen tai ффnikorttiemulaattorin jota ensisijaisesti tulisi " "kфyttфф" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Mффrittфф ффnikortin tai ффnikorttia emuloivan ohjelmiston" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Ensisijainen:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib emulaattori:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLibiф kфytetффn monien pelien musiikeissa" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Taajuus:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -671,61 +682,65 @@ msgstr "" "Isommat taajuudet merkitsevфt parempaa ффnenlaatua, mutta ффnikorttisi ei " "ehkф tue niitф." -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM laite:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Mффrittфф oletuksena kфytettфvфn ффnilaitteen General MIDIlle" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Фlф kфytф General MIDIф musiikissa" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Kфytф ensimmфistф laitetta" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "Ффnifontti:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "Jotkut ффnikortit tukevat ффnifonttia (SoundFont), FluidSynth ja Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "Ффnifontti:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Yhdistetty AdLib/MIDI tila" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Kфytф sekф MIDIф ettф Adlibiф ффnentuotantoon" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDIn ффnilisфys:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32 laite:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "Mффrittфф oletusффnilaitteen Roland MT-32/LAPC1/CM32l/CM64:n kфyttііn" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -733,192 +748,193 @@ msgstr "" "Valitse jos haluat kфyttфф aitoa Roland-yhteensopivaa laittetta joka on " "kytketty tietokoneeseesi" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Kфytф Roland GS moodia" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Poistaa General MIDIn peleistф joissa on Roland MT-32 ффniraita" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Фlф kфytф Roland MT-32 musiikkia" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Puhe" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Tekstitys" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Tekstin nopeus:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Puhe" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Tekstit" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Nфytф tekstitys ja kфytф puhetta" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekstin nopeus:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Vaimenna" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Erikoisefektit" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Mффrittфф polun, jossa on lisфtiedostoja joita ScummVM tai kaikki pelit " "kфyttфvфt" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Muut" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Muut" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Teema" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI renderіijф:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Nфppфimet" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "ScummVM:n kieli:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "ScummVM kфyttіliittymфn kieli" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "ScummVM pitфф kфynnistфф uudelleen jotta muutokset tulevat voimaan." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Valitse hakemisto pelitallennuksille." -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Valittuun hakemistoon ei voi kirjoittaa. Valitse toinen hakemisto." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Valitse hakemisto kфyttіliittymфn teemoille" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Valitse hakemisto lisфtiedostoille" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Valitse hakemisto plugineille" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1173,13 +1189,15 @@ msgid "~R~eturn to Launcher" msgstr "Palaa p~e~livalitsimeen" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Tallenna peli:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1207,12 +1225,12 @@ msgstr "" "lisфtietoa." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~H~yvфksy" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~P~eruuta" @@ -1220,23 +1238,23 @@ msgstr "~P~eruuta" msgid "~K~eys" msgstr "~N~фppфimet" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Vфriformaattia ei voitu alustaa" -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Videotilan vaihto ei onnistunut:'" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Kuvasuhdeasetusta ei voitu asettaa." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Kokoruututila-asetusta ei voi asettaa." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1249,7 +1267,7 @@ msgstr "" "pelin tiedostot kovalevyllesi. Avaa LUEMINUT\n" "tiedosto ohjeita varten." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1262,7 +1280,7 @@ msgstr "" "ohjelmistoa kфyttфen, jotta musiikit\n" "kuuluvat. Lue ohjeet LUEMINUT tiedostosta." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1271,7 +1289,7 @@ msgstr "" "Pelitilan lataus epфonnistui (%s)! Avaa LUEMINUT tiedosto saadaksesi " "lisфtietoa." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1281,28 +1299,49 @@ msgstr "" "epфvakaa, eivфtkф pelitallennukset vфlttфmфttф toimi tulevissa ScummVM:n " "versioissa." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Pelaa silti" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja, ScummVM valikoiden sijaan" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Lataa pelitallenne:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Lataa tallenne" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"Broken Sword 1:n pelitallennukset ovat vanhassa formaatissa. Tallennukset " +"tulee muuntaa,\n" +"jotta niitф voi kфyttфф ScummVM:ssф. Paina 'Hyvфksy' muuntaaksesi tiedostot. " +"Mikфli et halua muuntaa tiedostoja nyt\n" +"ScummVM kysyy asiaa seuraavan kerran kun kфynnistфt pelin.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Kфytф kirkaspalettitilaa" @@ -2013,7 +2052,7 @@ msgstr "Lennф oikealle" msgid "Fly to lower right" msgstr "Lennф alas oikealle" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2022,7 +2061,7 @@ msgstr "" "Suora MIDI tuki vaatii Roland pфivityksen LucasArtsilta, mutta\n" "%s puuttuu. Kфytetффn AdLibia sen sijaan." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2033,7 +2072,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2044,7 +2083,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2055,7 +2094,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2066,7 +2105,7 @@ msgstr "" "peli'. Valitse 'Maniac' hakemisto Tentacle hakemiston sisфltф." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~ip moodi valittu" @@ -2087,7 +2126,7 @@ msgstr "Nфytф kartta" msgid "~M~ain Menu" msgstr "Pффvalikko" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Vesiefekti pффllф" @@ -2109,6 +2148,15 @@ msgstr "Pelin tallentaminen tiedostoon epфonnistui." msgid "Failed to delete file." msgstr "Tiedoston tuhoaminen ei onnistunut." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Nopea moodi" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Pelin tallentaminen epфonnistui." @@ -2464,11 +2512,11 @@ msgstr "Apple II GS emulaattori (EI TOTEUTETTU)" msgid "C64 Audio Emulator" msgstr "C64 Audio emulaattori" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Alustetaan MT-32 emulaattoria" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 emulaattori" @@ -2652,12 +2700,12 @@ msgid "Normal (no scaling)" msgstr "Normaali (ei skaalausta)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Kuvasuhteen korjaus pффllф" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Kuvasuhteen korjaus pois pффltф" @@ -2666,7 +2714,7 @@ msgid "Active graphics filter:" msgstr "Valittu grafiikkafiltteri:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Ikkunoitu tila" @@ -2690,11 +2738,11 @@ msgstr "Nykyinen nфyttіtila" msgid "Current scale" msgstr "Nykyinen skaalaus" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Valittu filtteritila: Linear" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Valittu filtteritila: Nearest" @@ -3094,3 +3142,6 @@ msgstr "Klikkaus pффllф" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Disabled" msgstr "Klikkaus pois pффltф" + +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Kфytф Roland GS moodia" diff --git a/po/fr_FR.po b/po/fr_FR.po index ad1406ed18..2dfb4b6ae3 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-08 12:24+0100\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <scummvm-devel@lists.sf.net>\n" @@ -30,32 +30,42 @@ msgstr "Options incluses:" msgid "Available engines:" msgstr "Moteurs disponibles:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Afficher/Cacher la console" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Remonter" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Remonte d'un niveau dans la hiщrarchie de rщpertoire" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Remonter" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Annuler" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Choisir" @@ -91,17 +101,18 @@ msgid "Map" msgstr "Affecter" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -174,8 +185,8 @@ msgstr "" "Langue du jeu. Cela ne traduira pas en anglais par magie votre version " "espagnole du jeu." -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<defaut>" @@ -197,11 +208,11 @@ msgstr "Systшme:" msgid "Engine" msgstr "Moteur" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Graphique" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -214,7 +225,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Audio" @@ -227,11 +238,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -245,7 +256,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -258,7 +269,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -271,11 +282,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Chemins" @@ -289,7 +300,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Chemin du Jeu:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Extra:" @@ -297,42 +308,42 @@ msgstr "Extra:" 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:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Sauvegardes:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Sauvegardes:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Aucun" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Dщfaut" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Choisir une banque de sons" @@ -534,135 +545,135 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "%d nouveaux jeux trouvщs, %d jeux ignorщs (dщjр ajoutщ prщcщdemment) ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Jamais" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "Toutes les 5 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "Toutes les 10 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "Toutes les 15 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "Toutes les 30 mins" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Aucune" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Certaines options graphiques n'ont pu ъtre changщes:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "le mode vidщo n'a pu ъtre changщ." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "le mode plein щcran n'a pu ъtre changщ." -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "la correction de rapport d'aspect n'a pu ъtre changщe." -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Mode graphique:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Mode de rendu:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Mode spщcial de tramage supportщ par certains jeux" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Plein щcran" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Correction du rapport d'aspect" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrige le rapport d'aspect pour les jeu 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 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:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 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:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Щmulateur AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Frщquence:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -670,64 +681,68 @@ msgstr "" "Une valeur plus щlevщe donne une meilleure qualitщ audio mais peut ne pas " "ъtre supportщ par votre carte son" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Sortie GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 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:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Ne pas utiliser la musique General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Utiliser le premier pщriphщrique disponible" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "Banque de sons:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Mode mixe AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Utiliser р la fois MIDI et AdLib" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Gain MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Sortie MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -735,195 +750,196 @@ msgstr "" "Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland " "connectщ р l'ordinateur" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 exacte (pas d'щmu GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Activer le mode Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Ne pas utiliser la musique Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Voix" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Sous-titres" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Les deux" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Voix" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Affiche les sous-titres et joue les dialogues audio" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Volume Musique:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musique:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Silence" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Volume Bruitage:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volume des effets spщciaux sonores" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Bruitage:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Volume Dialogues:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Dialogues:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Thшme:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Interface:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Sauvegarde auto:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Sauvegarde:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Touches" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Langue:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Langue de l'interface graphique de ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 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:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Sщlectionner le rщpertoire des thшmes d'interface" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Sщlectionner le rщpertoire pour les fichiers suplщmentaires" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Sщlectionner le rщpertoire des plugins" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1181,13 +1197,15 @@ msgid "~R~eturn to Launcher" msgstr "Retour au ~L~anceur" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Sauvegarde:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1216,12 +1234,12 @@ msgstr "" "de base et les instructions pour obtenir de l'aide supplщmentaire." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~A~nnuler" @@ -1229,23 +1247,23 @@ msgstr "~A~nnuler" msgid "~K~eys" msgstr "~T~ouches" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Impossible d'initialiser le format des couleurs." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Impossible de changer le mode vidщo р: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Impossible d'appliquer la correction du rapport d'aspect." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Impossible d'appliquer l'option plein щcran." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1259,7 +1277,7 @@ msgstr "" "donnщes du jeu sur votre disque dur.\n" "Lisez le fichier README pour plus de dщtails." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1273,7 +1291,7 @@ msgstr "" "logiciel appropriщ.\n" "Lisez le fichier README pour plus de dщtails." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1282,7 +1300,7 @@ msgstr "" "Echec du chargement (%s)! . Lisez le fichier README pour les informations de " "base et les instructions pour obtenir de l'aide supplщmentaire." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1292,30 +1310,53 @@ msgstr "" "complшtement supportщ par ScummVM. Il est donc instable et les sauvegardes " "peuvent ne pas marcher avec une future version de ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Jouer quand mъme" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Dialogues sauvegarde/chargement d'origine" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utiliser les dialogues sauvegarde/chargement d'origine plutєt que ceux de " "ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Charger le jeu:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Charger" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM a trouvщ des anciens fichiers de sauvegarde pour Broken Sword 1 qui " +"ont besoin d'ъtre convertis.\n" +"L'ancien format de sauvegarde n'est plus supportщ, donc vous ne pourrez pas " +"les charger si vous ne les convertissez pas.\n" +"\n" +"Appuyer sur OK pour les convertir maintenant, sinon le mъme message " +"s'affichera la prochaine fois que vous dщmarrerez le jeu.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Utiliser le mode palette lumineuse" @@ -2029,7 +2070,7 @@ msgstr "Voler vers la droite" msgid "Fly to lower right" msgstr "Voler vers la bas р droite" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2038,7 +2079,7 @@ msgstr "" "Support MIDI natif requiшre la mise р jour Roland de LucasArt,\n" "mais %s manque. Utilise AdLib р la place." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2049,7 +2090,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2060,7 +2101,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2071,7 +2112,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2083,7 +2124,7 @@ msgstr "" "rщpertoire 'Maniac Mansion' dans le rщpertoire du jeu Day Of The Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Mode ~Z~ip Activщ" @@ -2104,7 +2145,7 @@ msgstr "Afficher la Carte" msgid "~M~ain Menu" msgstr "~M~enu Principal" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~E~ffets de l'Eau Activщs" @@ -2126,6 +2167,15 @@ msgstr "Щchec de l'enregistrement de l'щtat du jeu sur le disque." msgid "Failed to delete file." msgstr "Щchec de la suppression du fichier." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Mode rapide" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Щchec de la sauvegarde." @@ -2486,11 +2536,11 @@ msgstr "Щmulateur Apple II GS (PAS IMPLЩMENTЩ)" msgid "C64 Audio Emulator" msgstr "Щmulateur C64 Audio" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Initialisation de l'Щmulateur MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Щmulateur MT-32" @@ -2672,12 +2722,12 @@ msgid "Normal (no scaling)" msgstr "Normal" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Activer la correction du rapport d'aspect" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Dщsactiver la correction du rapport d'aspect" @@ -2686,7 +2736,7 @@ msgid "Active graphics filter:" msgstr "Mode graphique actif:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Mode Fenъtre" @@ -2710,11 +2760,11 @@ msgstr "Mode vidщo actuel" msgid "Current scale" msgstr "Щchelle actuelle" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Filtre actif: Linщaire" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Filtre actif: Plus proche" @@ -3115,6 +3165,9 @@ msgstr "Clic Activщ" msgid "Clicking Disabled" msgstr "Clic Dщsactivщ" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Activer le mode Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules Vert" diff --git a/po/gl_ES.po b/po/gl_ES.po index a650ff338d..6f3cc668ff 100644 --- a/po/gl_ES.po +++ b/po/gl_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-08-15 13:33+0100\n" "Last-Translator: Santiago G. Sanz <s.sanz@uvigo.es>\n" "Language-Team: \n" @@ -29,32 +29,42 @@ msgstr "Funcionalidades compiladas:" msgid "Available engines:" msgstr "Motores dispoёibles:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Mostrar/ocultar consola" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Ir ao directorio superior" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Elexir" @@ -90,17 +100,18 @@ msgid "Map" msgstr "Asignar" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "Aceptar" @@ -171,8 +182,8 @@ msgid "" "English" msgstr "Idioma do xogo. Non converterс a versiѓn galega do xogo en inglesa" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<por defecto>" @@ -194,11 +205,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "Efectos grсficos" @@ -211,7 +222,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Anular a configuraciѓn dos grсficos" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Son" @@ -224,11 +235,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Anular a configuraciѓn do son" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -242,7 +253,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Anular a configuraciѓn do volume" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -255,7 +266,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Anular a configuraciѓn de MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -268,11 +279,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Anular a configuraciѓn de MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Camiёos" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Camiёos" @@ -286,7 +297,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camiёo do xogo:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Camiёo adicional:" @@ -294,42 +305,42 @@ msgstr "Camiёo adicional:" msgid "Specifies path to additional data used the game" msgstr "Especifica o camiёo dos datos adicionais usados no xogo" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Camiёo adicional:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Especifica o lugar dos ficheiros de gardado" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ningњn" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinido" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Seleccionar SoundFont" @@ -528,133 +539,133 @@ msgstr "%d directorios analizados..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d xogos novos atopados; %d xogos xa engadidos ignorados..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "cada 5 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "cada 10 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "cada 15 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "cada 30 min" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ningunha" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Erro ao aplicar os cambios na configuraciѓn dos grсficos:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "non se puido cambiar o modo de vэdeo." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "non se puido cambiar a configuraciѓn de pantalla completa." -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "non se puido cambiar a proporciѓn." -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Modo de grсficos:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Modo de procesamento:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Modos de interpolaciѓn de cores compatibles con algњns xogos" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Correcciѓn de proporciѓn" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrixir a proporciѓn para os xogos en 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Dispositivo preferido:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica o dispositivo ou emulador de tarxeta de son preferido" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Especifica o dispositivo ou emulador de tarxeta de son de saэda" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. mњsica:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Emulador de AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "Moitos xogos empregan AdLib para a mњsica" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -662,255 +673,260 @@ msgstr "" "A maior valor, maior calidade do son, mais talvez non sexa compatible coa " "tarxeta" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Dispositivo de GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "" "Especifica o dispositivo de son por defecto para a saэda de General MIDI" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Non empregar mњsica en General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Empregar o primeiro dispositivo dispoёible" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont щ compatible con algunhas tarxetas de son, Fluidsynth e Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI mixto" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Empregar xeraciѓn de son MIDI e mсis AdLib" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Ganancia de MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Dispositivo de MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Especifica o dispositivo por defecto para a saэda de Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 verdadeiro (sen emulaciѓn de GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" "Marcar para empregar o hardware compatible con Roland conectado ao sistema" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 (sen emulaciѓn de GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Activar modo Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland MT-32 verdadeiro (sen emulaciѓn de GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Desactiva o General MIDI para os xogos con mњsica en Roland MT-32" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Non empregar mњsica en Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Velocidade dos subtэtulos:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Mostrar os subtэtulos e reproducir as voces" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade subs:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Volume de mњsica:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Volume mњsica:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Silenciar todo" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Volume de efectos:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volume dos efectos de son" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume efectos:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Volume de voz:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voz:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Camiёo do tema:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Camiёo tema:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Especificar o camiёo dos datos adicionais de todos os xogos ou de ScummVM" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Camiёo dos complementos:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camiёo complementos:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Misc." -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Misc." -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Procesamento da interfaz:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Idioma de interfaz:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Idioma da interfaz de ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Debes reiniciar ScummVM para que os cambios teёan efecto." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Seleccionar directorio para ficheiros de gardado" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Non щ posible escribir no directorio elixido. Selecciona outro." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Seleccionar directorio para temas de interfaz" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Seleccionar directorio para ficheiros adicionais" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Seleccionar directorio para complementos" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1163,13 +1179,15 @@ msgid "~R~eturn to Launcher" msgstr "~V~olver ao Iniciador" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Gardar partida:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1198,12 +1216,12 @@ msgstr "" "bсsica e mсis instruciѓns para acadar asistencia adicional." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~A~ceptar" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~C~ancelar" @@ -1211,23 +1229,23 @@ msgstr "~C~ancelar" msgid "~K~eys" msgstr "~T~eclas" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Non se puido iniciar o formato de cor." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Non se puido cambiar ao modo de vэdeo: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Non se puido aplicar a configuraciѓn de proporciѓn." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Non se puido aplicar a configuraciѓn de pantalla completa." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1241,7 +1259,7 @@ msgstr "" "os ficheiros de datos ao disco duro. Consulta\n" "o ficheiro README para obter mсis informaciѓn." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1255,7 +1273,7 @@ msgstr "" "do xogo. Consulta o ficheiro README\n" "para obter mсis informaciѓn." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1264,7 +1282,7 @@ msgstr "" "Erro ao cargar (%s)! Consulta o ficheiro README para obter informaciѓn " "bсsica e mсis instruciѓns para acadar asistencia adicional." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1274,29 +1292,52 @@ msgstr "" "Por iso, talvez sexa inestable e os ficheiros de gardado talvez non " "funcionen en futuras versiѓns de ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Iniciar de todos os xeitos" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Empregar pantallas orixinais de gardado e carga" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Empregar as pantallas orixinais de gardado e carga, no canto das de ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Restaurar xogo:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Restaurar" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM atopou ficheiros de gardado vellos de Broken Sword 1 que deberэan " +"ser convertidos.\n" +"O formato vello xa non щ compatible, de xeito que non poderсs cargar as " +"partidas se non os convertes.\n" +"\n" +"Preme Aceptar para convertilos. Se non, volverсs ver esta mensaxe a prѓxima " +"vez que inicies o xogo.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Empregar modo de paleta intensa" @@ -2010,7 +2051,7 @@ msgstr "Voar с dereita" msgid "Fly to lower right" msgstr "Voar с dereita abaixo" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2019,7 +2060,7 @@ msgstr "" "A compatibilidade nativa con MIDI precisa a actualizaciѓn de Roland\n" "de LucasArts, mais falla %s. Empregarase AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2030,7 +2071,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2041,7 +2082,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2052,7 +2093,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2063,7 +2104,7 @@ msgstr "" "selecciona o directorio Maniac que estс dentro do directorio Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Modo ~c~omprimido activado" @@ -2084,7 +2125,7 @@ msgstr "Mo~s~trar mapa" msgid "~M~ain Menu" msgstr "~M~enњ principal" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Efecto de ~a~uga activado" @@ -2106,6 +2147,15 @@ msgstr "Erro ao gardar a partida no ficheiro." msgid "Failed to delete file." msgstr "Erro ao eliminar o ficheiro." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Modo rсpido" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Erro ao gardar a partida" @@ -2469,11 +2519,11 @@ msgstr "Emulador de Apple II GS (non implementado)" msgid "C64 Audio Emulator" msgstr "Emulador de C64 Audio" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Iniciando emulador de MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" @@ -2655,12 +2705,12 @@ msgid "Normal (no scaling)" msgstr "Normal (sen escala)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Correcciѓn de proporciѓn activada" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Correcciѓn de proporciѓn desactivada" @@ -2669,7 +2719,7 @@ msgid "Active graphics filter:" msgstr "Filtro de grсficos activo:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Modo en ventс" @@ -2693,11 +2743,11 @@ msgstr "Modo de visualizaciѓn actual" msgid "Current scale" msgstr "Escala actual" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Modo de filtro activo: lineal" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Modo de filtro activo: mсis prѓximo" @@ -3095,3 +3145,6 @@ msgstr "Premer activado" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Disabled" msgstr "Premer desactivado" + +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Activar modo Roland GS" diff --git a/po/hu_HU.po b/po/hu_HU.po index 03b6c1a405..ae12cbac5a 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: 2012-12-01 17:22+0000\n" -"PO-Revision-Date: 2012-12-22 09:15+0100\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" +"PO-Revision-Date: 2013-02-03 09:21+0100\n" "Last-Translator: George Kormendi <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" "Language: Magyar\n" @@ -32,32 +32,41 @@ msgstr "Lefordэtott іsszetevѕk:" msgid "Available engines:" msgstr "Tсmogatott jсtщkmotorok:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +msgid "Show hidden files" +msgstr "Rejtett fсjlok lсtszanak" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "Rejtett attribњtumu fсjlok megjelenэtщse" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Feljebb" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Vissza az elѕzѕ kіnyvtсrszintre" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Feljebb" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Mщgse" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vсlaszt" @@ -93,17 +102,18 @@ msgid "Map" msgstr "Kiosztсs" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -174,8 +184,8 @@ msgid "" msgstr "" "A jсtщk nyelve. Ne сllэtsd сt a pl. Spanyol nyelvћ jсtщkodat Angol nyelvre" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<alapщrtelmezett>" @@ -197,11 +207,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -214,7 +224,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Audiѓ" @@ -227,11 +237,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Hangerѕ" @@ -245,7 +255,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -258,7 +268,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -271,11 +281,11 @@ 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:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Mappсk" @@ -289,7 +299,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Extra Mappa:" @@ -297,42 +307,42 @@ msgstr "Extra Mappa:" 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:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Nincs" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Alapщrtelmezett" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "SoundFont kivсlasztсs" @@ -532,194 +542,198 @@ msgstr "%d Mappa сtvizsgсlva..." 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:84 msgid "Never" msgstr "Soha" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "5 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "10 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "15 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "30 percenkщnt" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Nincs" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "a videѓmѓd nem vсltozott." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott" -#: gui/options.cpp:406 +#: gui/options.cpp:412 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:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafikus mѓd:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Kirajzolсs mѓd:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 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:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Teljeskщpernyѕs mѓd:" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Kщpmщretarсny korrekciѓ" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Elsѕdleges eszkіz:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 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:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Elsѕdleges eszk.:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Kimeneti rсta:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 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:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM Eszkіz:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Ne hasznсlj General MIDI zenщt" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Vegyes AdLib/MIDI mѓd" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI erѕsэtщs:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "FluidSynth Beсllэtсsa" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32 Eszkіz:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -727,190 +741,190 @@ msgstr "" "Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a " "gщpedhez щs hasznсlni akarod" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Roland GS Mѓd engedщlyezve" +#: gui/options.cpp:890 +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland GS Mѓd (GM mapping tiltсsa)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Ne hasznсlj Roland MT-32 zenщt" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Szіveg щs beszщd:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Csak beszщd" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Csak felirat" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Mind" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Felirat щs beszщd:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Besz" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Text" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Mind" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Hang щs feliratok megjelenэtщse" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "жsszes nщmэtсsa" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Speciсlis hangeffektusok hangereje" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tщma:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI Renderelѕ:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Billentyћk" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "GUI nyelve:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "A ScummVM GUI nyelve" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 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:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Vсlassz jсtщkmentщs mappсt" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "GUI tщma mappa kivсlasztсsa" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Mappa vсlasztсs az extra fсjloknak" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Plugin mappa kivсlasztсsa" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1163,13 +1177,15 @@ msgid "~R~eturn to Launcher" msgstr "Visszatщrщs az indэtѓba" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Jсtщk mentщse:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1197,12 +1213,12 @@ msgstr "" "informсciѓkrѓl, щs hogy hogyan segэthetsz a kщsѕbbiekben." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "Mщgse" @@ -1210,23 +1226,23 @@ msgstr "Mщgse" msgid "~K~eys" msgstr "Billentyќk" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Szэn formсtum nincs alkalmazva" -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Videѓmѓd nincs сtсllэtva: ' " -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Mщretarсny korrekciѓ nem vсltozott." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Teljeskщpernyѕs beсllэtсs nincs alkalmazva" -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1240,7 +1256,7 @@ msgstr "" "adatfсjljait a merevlemezedre.\n" "Nщzd meg a README fсjlt a rщszletekщrt." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1254,7 +1270,7 @@ msgstr "" "hogy a jсtщk zenщje hallhatѓ legyen.\n" "Nщzd meg a README fсjlt a rщszletekщrt." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1263,7 +1279,7 @@ msgstr "" "(%s) jсtщkсllсs betіltщse nem sikerќlt!. Olvassd el a README-t az alap " "informсciѓkrѓl, щs hogy hogyan segэthetsz a kщsѕbbiekben." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1273,28 +1289,49 @@ msgstr "" "ScummVM. Szсmэts rс hogy nem stabilan fut, щs a mentщsek nem mћkіdnek a " "jіvѕbeni ScummVM verziѓkkal." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Indэtсs эgy is" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Eredeti ment/tіlt kщpernyѕk hasznсlata" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Az eredeti mentщs/betіltщs kщpernyѕ hasznсlata a ScummVM kщpek helyett" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Jсtщkmenet visszaсllэtсsa:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Visszaсllэtсs" +#: engines/drascula/saveload.cpp:49 +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM rщgi jсtщkmentщst talсlt a Drascula-hoz, ezt сt kell alakэtani.\n" +"A rщgi jсtщkmentщs forma tіbbщ nem tсmogatott, ezщrt a jсtщk mentщse nem " +"tіltѕdik be ha nem akэtod сt azt.\n" +"\n" +"Nyomj OK-t ha сtalakэtod most, vagy rсkщrdezek њjra ha legkіzelebb elindэtod " +"a jсtщkot.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Fщnyes paletta mѓd hasznсlata" @@ -2004,7 +2041,7 @@ msgstr "Jobbra repќlщs" msgid "Fly to lower right" msgstr "Jobbra le repќlщs" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2013,7 +2050,7 @@ msgstr "" "Native MIDI tсmogatсshoz kell a Roland Upgrade a LucasArts-tѓl,\n" "a %s hiсnyzik. AdLib-ot hasznсlok helyette." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2024,7 +2061,7 @@ msgstr "" "\n" "%s fсjlba nem sikerќlt" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2035,7 +2072,7 @@ msgstr "" "\n" "%s fсjlbѓl nem sikerќlt" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2046,7 +2083,7 @@ msgstr "" "\n" "%s fсjlba elkщszќlt" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2057,7 +2094,7 @@ msgstr "" "vсlaszd a 'Maniac' mappсt a 'Tentacle' kіnyvtсrсban." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~ip Mѓd aktivсlva" @@ -2078,7 +2115,7 @@ msgstr "~S~ Tщrkщp" msgid "~M~ain Menu" msgstr "Fѕ~M~enќ" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Vэzeffektus engedщlyezve" @@ -2100,6 +2137,14 @@ msgstr "Jсtщkсllсs mentщse fсjlba nem sikerќlt." msgid "Failed to delete file." msgstr "Fсjl tіrlщs sikertelen." +#: engines/groovie/detection.cpp:312 +msgid "Fast movie speed" +msgstr "Gyors filmsebessщg" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "Filmek lejсtszсsa nagyobb sebessщggel" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Jсtщk mentщs nem sikerќlt" @@ -2457,11 +2502,11 @@ msgstr "Apple II GS Emulсtor (NEM TСMOGATOTT)" msgid "C64 Audio Emulator" msgstr "C64 Audio Emulсtor" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "MT-32 Emulсtor inicializсlсsa" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 Emulсtor" @@ -2643,12 +2688,12 @@ msgid "Normal (no scaling)" msgstr "Normсl (nincs сtmщretezщs)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Mщretarсny korrekciѓ engedщlyezve" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Mщretarсny korrekciѓ letiltva" @@ -2657,7 +2702,7 @@ msgid "Active graphics filter:" msgstr "Aktэv grafikus szћrѕk:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Ablakos mѓd" @@ -2681,11 +2726,11 @@ msgstr "Jelenlegi videѓmѓd" msgid "Current scale" msgstr "Aktuсlis mщretezщs" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktэv filter mѓd: Lineсris" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktэv filter mѓd: Kіzelэtѕ" @@ -3081,6 +3126,9 @@ msgstr "Kattintсs engedve" msgid "Clicking Disabled" msgstr "Kattintсs tiltva" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Roland GS Mѓd engedщlyezve" + #~ msgid "Hercules Green" #~ msgstr "Hercules Zіld" diff --git a/po/it_IT.po b/po/it_IT.po index 220e18fce5..6affa87fd2 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-09 09:30+0100\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" @@ -29,32 +29,42 @@ msgstr "Funzionalitр compilate in:" msgid "Available engines:" msgstr "Motori disponibili:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Mostra/nascondi console" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Cartella superiore" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Vai alla cartella superiore" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Su" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Annulla" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Scegli" @@ -90,17 +100,18 @@ msgid "Map" msgstr "Mappa" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -172,8 +183,8 @@ msgid "" msgstr "" "Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<predefinito>" @@ -195,11 +206,11 @@ msgstr "Piattaf.:" msgid "Engine" msgstr "Motore" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafica" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "Grafica" @@ -212,7 +223,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Audio" @@ -225,11 +236,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -243,7 +254,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -256,7 +267,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -269,11 +280,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Percorsi" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Perc." @@ -287,7 +298,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Perc. gioco:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Percorso extra:" @@ -295,42 +306,42 @@ msgstr "Percorso extra:" msgid "Specifies path to additional data used the game" msgstr "Specifica il percorso di ulteriori dati usati dal gioco" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Perc. extra:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Salvataggi:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Specifica dove archiviare i salvataggi" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Salvataggi:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Nessuno" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinito" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Seleziona SoundFont" @@ -533,135 +544,135 @@ msgstr "%d cartelle analizzate..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Rilevati %d nuovi giochi, ignorati %d giochi aggiunti in precedenza..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Mai" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "ogni 5 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "ogni 10 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "ogni 15 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "ogni 30 minuti" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Nessuno" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Impossibile applicare alcuni dei cambiamenti nelle opzioni grafiche." -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "impossibile modificare la modalitр video." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "impossibile modificare l'impostazione schermo intero" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "impossibile modificare l'impostazione proporzioni" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Modalitр:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Resa grafica:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Modalitр a schermo intero" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Correzione proporzioni" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregge le proporzioni dei giochi 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Disp. preferito:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Dispositivo audio:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Specifica il dispositivo audio o l'emulatore della scheda audio preferiti" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 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:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferito:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Disposit. audio:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Emulatore AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib ш utilizzato per la musica in molti giochi" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Frequenza:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -669,62 +680,66 @@ msgstr "" "Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non " "essere supportati dalla tua scheda audio" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Non utilizzare la musica General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Utilizza il primo dispositivo disponibile" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont ш supportato da alcune schede audio, Fluidsynth e Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Modalitр mista AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilizza generazione di suono sia MIDI che AdLib" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Guadagno MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -732,192 +747,193 @@ msgstr "" "Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland " "che ш connesso al tuo computer" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 effettivo (disat.emul.GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Attiva la modalitр Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Non utilizzare la musica Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Voci" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Sottotitoli" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Entrambi" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Voci" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Sub" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Entr." -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Mostra i sottotitoli e attiva le voci" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Disattiva audio" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volume degli effetti sonori" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Percorso tema:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Perc. tema:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Percorso plugin:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Perc. plugin:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Renderer GUI:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Tasti" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Lingua GUI:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Lingua dell'interfaccia grafica di ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Devi riavviare ScummVM affinchщ le modifiche abbiano effetto." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Seleziona la cartella per i salvataggi" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Seleziona la cartella dei temi dell'interfaccia" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Seleziona la cartella dei file aggiuntivi" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Seleziona la cartella dei plugin" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1174,13 +1190,15 @@ msgid "~R~eturn to Launcher" msgstr "~V~ai a elenco giochi" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Salva gioco:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1210,12 +1228,12 @@ msgstr "" "assistenza." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~A~nnulla" @@ -1223,23 +1241,23 @@ msgstr "~A~nnulla" msgid "~K~eys" msgstr "~T~asti" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Impossibile inizializzare il formato colore." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Impossibile cambiare la modalitр video: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Impossibile applicare l'impostazione proporzioni" -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Impossibile applicare l'impostazione schermo intero." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1253,7 +1271,7 @@ msgstr "" "sull'hard disk.\n" "Vedi il file README per i dettagli." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1267,7 +1285,7 @@ msgstr "" "la musica del gioco.\n" "Vedi il file README per i dettagli." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1277,7 +1295,7 @@ msgstr "" "per le informazioni di base e per le istruzioni su come ottenere ulteriore " "assistenza." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1287,30 +1305,53 @@ msgstr "" "ScummVM. Ш quindi possibile che sia instabile, e i salvataggi potrebbero non " "funzionare con future versioni di ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Avvia comunque" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Usa schermate di salvataggio originali" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Usa le schermate originali di salvataggio e caricamento, al posto di quelle " "di ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Ripristina gioco:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Ripristina" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM ha trovato vecchi salvataggi per Broken Sword 1 che dovrebbero " +"essere convertiti.\n" +"Il vecchio formato di salvataggio non ш piљ supportato, quindi non potrai " +"caricare i tuoi salvataggi senza prima convertirli.\n" +"\n" +"Premi OK per convertirli adesso, altrimenti ti verrр richiesto al prossimo " +"avvio del gioco.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Usa modalitр colori brillanti" @@ -2023,7 +2064,7 @@ msgstr "Vola a destra" msgid "Fly to lower right" msgstr "Vola in basso a destra" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2032,7 +2073,7 @@ msgstr "" "Il supporto nativo MIDI richiede il Roland Upgrade della LucasArts,\n" "ma %s non ш presente. Verrр usato AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2043,7 +2084,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2054,7 +2095,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2065,7 +2106,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2077,7 +2118,7 @@ msgstr "" "cartella di Day Of The Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Modalitр ~Z~ip attivata" @@ -2098,7 +2139,7 @@ msgstr "~M~ostra mappa" msgid "~M~ain Menu" msgstr "~M~enu principale" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~E~ffetto acqua attivo" @@ -2120,6 +2161,15 @@ msgstr "Impossibile salvare il gioco nel file." msgid "Failed to delete file." msgstr "Impossibile eliminare il file." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Modalitр veloce" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Impossibile salvare il gioco" @@ -2482,11 +2532,11 @@ msgstr "Emulatore Apple II GS (NON IMPLEMENTATO)" msgid "C64 Audio Emulator" msgstr "Emulatore audio C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Avvio in corso dell'emulatore MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Emulatore MT-32" @@ -2668,12 +2718,12 @@ msgid "Normal (no scaling)" msgstr "Normale (no ridim.)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Correzione proporzioni attivata" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Correzione proporzioni disattivata" @@ -2682,7 +2732,7 @@ msgid "Active graphics filter:" msgstr "Filtro grafico attivo:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Modalitр finestra" @@ -2706,11 +2756,11 @@ msgstr "Modalitр visualizzazione attuale" msgid "Current scale" msgstr "Dimensioni attuali" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Modalitр filtro attiva: Lineare" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Modalitр filtro attiva: Piљ vicino" @@ -3109,6 +3159,9 @@ msgstr "Clic attivato" msgid "Clicking Disabled" msgstr "Clic disattivato" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Attiva la modalitр Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules verde" diff --git a/po/nb_NO.po b/po/nb_NO.po index bf94822c95..15f08909ad 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-04 02:19+0100\n" "Last-Translator: Einar Johan Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -33,32 +33,42 @@ msgstr "Funksjoner innkompilert:" msgid "Available engines:" msgstr "Tilgjengelige motorer:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Vis / Skjul konsollen" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Gх til forrige mappenivх" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Velg" @@ -94,17 +104,18 @@ msgid "Map" msgstr "Koble" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -177,8 +188,8 @@ msgstr "" "Spillets sprхk. Dette vil ikke gjјre din spanske spillversjon om til engelsk " "versjon" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" @@ -200,11 +211,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -217,7 +228,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Lyd" @@ -230,11 +241,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -248,7 +259,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -261,7 +272,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -274,11 +285,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Sti" @@ -292,7 +303,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -300,42 +311,42 @@ msgstr "Ekstrasti:" msgid "Specifies path to additional data used the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Velg SoundFont" @@ -537,133 +548,133 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "hvert 5. min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "hvert 10. min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "hvert 15. min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "hvert 30. min" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Klarte ikke х aktivere enkelte av endringene i grafikkinstillinger:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "videomodusen kunne ikke endres." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "fullskjermsinnstillingen kunne ikke endres" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "aspektrate-innstillingen kunne ikke endres" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stјttet av enkelte spill" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Aspekt-rate korrigering" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Korriger aspekt-rate for 320x200-spill" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Foretrukket enhet:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretrukket enh.:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -671,60 +682,64 @@ msgstr "" "Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt " "lydkort " -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Velger standard lydenhet for General MIDI-utdata" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Bruk fјrste tilgjengelige enhet" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Mikset AdLib/MIDI-modus" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Bruk bхde MIDI- og AdLib- lydgenerering" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32 Enhet:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -732,190 +747,191 @@ msgstr "" "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " "vil bruke dette." -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Aktiver Roland GS-modus" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Ikke bruk Roland MT-32-musikk" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Begge" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Teksthastighet:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Vis undertekster, og spill av tale" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Underteksthastighet:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Div" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI-tegner:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mх starte ScummVM pх nytt for at endringene skal tre i kraft. " -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Velg mappe for lagrede spill" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Velg mappe for GUI-temaer" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Velg mappe for ytterligere filer" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Velg mappe for plugins" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1172,13 +1188,15 @@ msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Lagret spill:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1207,12 +1225,12 @@ msgstr "" "grunnleggende informasjon og instruksjon om hvordan du fхr ytterligere hjelp." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~A~vbryt" @@ -1220,23 +1238,23 @@ msgstr "~A~vbryt" msgid "~K~eys" msgstr "~T~aster" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Kunne ikke initalisere fargeformat." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Kunne ikke veksle til videomodus: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Kunne ikke aktivere aspektrate-innstilling." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Kunne ikke aktivere fullskjermsinnstilling." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1250,7 +1268,7 @@ msgstr "" "datafilene til harddisken din istedet.\n" "Se README-filen for detaljer." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1259,14 +1277,14 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1276,28 +1294,51 @@ msgstr "" "Derfor er det sannsynlig at det vil vцre ustabilt, og det er ikke sikkert at " "lagrede spill vil fortsette х fungere i fremtidige versjoner av ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Start allikevel" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Bruk originale lagre/laste-skjermer" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Gjennopprett spill:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Gjenopprett" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM oppdaget at du har gamle lagrede spill for Broken Sword 1 som bјr " +"konverteres.\n" +"Det gamle formatet for lagrede spill stјttes ikke lengre, sх du vil ikke " +"vцre i stand til х laste de lagrede spillene,\n" +"med mindre du konverterer dem.\n" +"Trykk OK for х konvertere dem nх, ellers vil du bli spurt igjen neste gang " +"du starter spillet." + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Bruk lys palettmodus" @@ -2006,14 +2047,14 @@ msgstr "Fly til hјyre" msgid "Fly to lower right" msgstr "Fly til nedre hјyre" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2024,7 +2065,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2035,7 +2076,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2046,7 +2087,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2057,7 +2098,7 @@ msgstr "" "hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" @@ -2078,7 +2119,7 @@ msgstr "Vi~s~ Kart" msgid "~M~ain Menu" msgstr "Hoved~m~eny" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~V~anneffekt aktivert" @@ -2100,6 +2141,15 @@ msgstr "Klarte ikke lagre spilltilstand fra fil." msgid "Failed to delete file." msgstr "Klarte ikke х slette fil." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Rask modus" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Klarte ikke х lagre spill." @@ -2453,11 +2503,11 @@ msgstr "Apple II GS Emulator (IKKE IMPLEMENTERT)" msgid "C64 Audio Emulator" msgstr "C64 Lydemulator" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Initialiserer MT-32-Emulator" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" @@ -2640,12 +2690,12 @@ msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Aspekt-rate korrigering aktivert" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Aspekt-rate korrigering deaktivert" @@ -2654,7 +2704,7 @@ msgid "Active graphics filter:" msgstr "Aktivt grafikkfilter:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Vindusmodus" @@ -2678,11 +2728,11 @@ msgstr "Nхvцrende videomodus" msgid "Current scale" msgstr "Nхvцrende skala" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktiv filtermodus: Linjцr" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktiv filtermodus: Nцrmeste" @@ -3083,6 +3133,9 @@ msgstr "Klikking aktivert" msgid "Clicking Disabled" msgstr "Klikking deaktivert" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Aktiver Roland GS-modus" + #~ msgid "Hercules Green" #~ msgstr "Hercules Grјnn" diff --git a/po/nn_NO.po b/po/nn_NO.po index 64c18effa8..510d4d38ee 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\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" @@ -33,32 +33,42 @@ msgstr "Funksjonar innkompilert:" msgid "Available engines:" msgstr "Tilgjengelege motorar:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Vis / Skjul konsoll" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Gх til forrige mappenivх" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Gх tilbake" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vel" @@ -95,17 +105,18 @@ msgid "Map" msgstr "Kople" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -178,8 +189,8 @@ msgstr "" "Spelets sprхk. Dette vil ikkje gjere den spanske versjonen av spelet til ein " "engelsk versjon" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" @@ -202,11 +213,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Undersјk" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -219,7 +230,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Lyd" @@ -232,11 +243,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -250,7 +261,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -263,7 +274,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -276,11 +287,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Stiar" @@ -294,7 +305,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -302,42 +313,42 @@ msgstr "Ekstrasti:" msgid "Specifies path to additional data used the game" msgstr "" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Vel SoundFont" @@ -536,133 +547,133 @@ msgstr "Sјkt i %d mappar ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Oppdaga %d nye spel ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "kvart 5. min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "kvart 10. min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "kvart 15. min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "kvart 30. min" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Teiknemodus:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som stјttast av nokre spel" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Aspekt-korrigering" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Rett opp aspekt for 320x200 spel" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib nyttast til musikk i mange spel" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -670,250 +681,255 @@ msgstr "" "Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av " "lydkortet ditt" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Ikkje nytt General MIDI musikk" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont stјttast av enkelte lydkort, Fluidsynth og Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Blanda AdLib/MIDI-modus" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Nytt bхe MIDI og AdLib lydskaping" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (ingen GS-emulering)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Aktiver Roland GS-modus" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Ikkje nytt Roland MT-32 musikk" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Teksting" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Begge" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Bхe" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Vis teksting og spel av tale" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Div" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI-teiknar:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Tastar" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 #, 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:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Vel mappe for lagra spel" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Vel ei mappe for GUI-tema:" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Vel ei mappe for plugins" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1172,13 +1188,15 @@ msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Lagra spel:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1202,12 +1220,12 @@ msgid "" msgstr "" #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~A~vbryt" @@ -1215,25 +1233,25 @@ msgstr "~A~vbryt" msgid "~K~eys" msgstr "~T~astar" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "" -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 #, fuzzy msgid "Could not switch to video mode: '" msgstr "Gjeldende videomodus:" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 #, fuzzy msgid "Could not apply aspect ratio setting." msgstr "Veksle aspekt-korrigering" -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "" -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1242,7 +1260,7 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1251,42 +1269,57 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Gjenopprett spel:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Gjenopprett" +#: engines/drascula/saveload.cpp:49 +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + #: engines/dreamweb/detection.cpp:57 #, fuzzy msgid "Use bright palette mode" @@ -2005,14 +2038,14 @@ msgstr "Fly til hјgre" msgid "Fly to lower right" msgstr "Fly til nedre hјgre" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2020,7 +2053,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2028,7 +2061,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2036,7 +2069,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2047,7 +2080,7 @@ msgstr "" "menyen og vel 'Maniac'-undermappa i 'Tentacle'-mappa." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" @@ -2069,7 +2102,7 @@ msgstr "" msgid "~M~ain Menu" msgstr "ScummVM Hovudmeny" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~V~anneffekt aktivert" @@ -2091,6 +2124,15 @@ msgstr "" msgid "Failed to delete file." msgstr "" +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Rask modus" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 #, fuzzy msgid "Failed to save game" @@ -2419,12 +2461,12 @@ msgstr "Apple II GS Emulator (IKKJE IMPLEMENTERT)" msgid "C64 Audio Emulator" msgstr "C64 Lydemulator" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 #, fuzzy msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32-emulator" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" @@ -2609,13 +2651,13 @@ msgid "Normal (no scaling)" msgstr "Normal (inga skalering)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 #, fuzzy msgid "Enabled aspect ratio correction" msgstr "Veksle aspekt-korrigering" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 #, fuzzy msgid "Disabled aspect ratio correction" msgstr "Veksle aspekt-korrigering" @@ -2626,7 +2668,7 @@ msgid "Active graphics filter:" msgstr "Veksle grafikkfiltre" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 #, fuzzy msgid "Windowed mode" msgstr "Teiknemodus:" @@ -2652,11 +2694,11 @@ msgstr "Gjeldende videomodus:" msgid "Current scale" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "" @@ -3064,6 +3106,9 @@ msgstr "" msgid "Clicking Disabled" msgstr "" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Aktiver Roland GS-modus" + #~ msgid "Hercules Green" #~ msgstr "Hercules Grјnn" diff --git a/po/pl_PL.po b/po/pl_PL.po index 154d05a411..dab3f2008b 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-29 15:49+0100\n" "Last-Translator: MichaГ ZiБbkowski <mziab@o2.pl>\n" "Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n" @@ -33,32 +33,42 @@ msgstr "Wkompilowane funkcje:" msgid "Available engines:" msgstr "Dostъpne silniki:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Schowaj / pokaП konsolъ" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "W gѓrъ" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "PrzejdМ do poprzedniego katalogu" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "W gѓrъ" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Anuluj" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Wybierz" @@ -94,17 +104,18 @@ msgid "Map" msgstr "Przypisz" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -175,8 +186,8 @@ msgid "" "English" msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ." -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<domyЖlne>" @@ -198,11 +209,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Silnik" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "Grafika" @@ -215,7 +226,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "DМwiъk" @@ -228,11 +239,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "GГoЖnoЖц" @@ -246,7 +257,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -259,7 +270,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -272,11 +283,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "ІcieПki" @@ -290,7 +301,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Іc. dodatkѓw:" @@ -298,42 +309,42 @@ msgstr "Іc. dodatkѓw:" msgid "Specifies path to additional data used the game" msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "OkreЖla gdzie zapisywaц stan gry" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Brak" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "DomyЖlnie" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Wybierz SoundFont" @@ -531,133 +542,133 @@ msgstr "Przeskanowano %d katalogѓw ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Wykryto %d nowych gier, zignorowano %d poprzednio dodanych..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Nigdy" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "co 5 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "co 10 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "co 15 min" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "co 30 min" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Brak" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Nie udaГo siъ zastosowaц czъЖci zmian opcji grafiki:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "nie udaГo siъ zmieniц trybu wideo." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "nie udaГo siъ zmieniц formatu obrazu" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Tryb grafiki:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Renderer:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "PeГny ekran" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Korekcja formatu obrazu" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Korekcja formatu obrazu dla gier 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 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:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 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:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Emulator AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib jest uПywany do muzyki w wielu grach" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Czъst. wyj.:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -665,63 +676,67 @@ 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:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "UrzБdzenie GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 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:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Nie uПywaj muzyki General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "UПyj pierwszego dostъpnego urzБdzenia" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Tryb miksowanego AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 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:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Wzm. MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "UrzБdzenie MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -729,191 +744,192 @@ msgstr "" "Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland " "podГБczonej do twojego komputera" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "WГБcz tryb Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Nie uПywaj muzyki Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Mowa" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Napisy" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Oba" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Mowa" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Napisy" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "WyЖwietlaj napisy i odtwarzaj mowъ" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Wycisz" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "GГoЖnoЖц efektѓw dМw." -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Styl:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Renderer interf.:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Klawisze" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Jъzyk interfejsu:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Jъzyk interfejsu ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 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:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Wybierz katalog zapisѓw" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Wybierz katalog dla stylѓw GUI." -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Wybierz katalog dla dodatkowych plikѓw" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Wybierz katalog dla wtyczek" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1169,13 +1185,15 @@ msgid "~R~eturn to Launcher" msgstr "~P~owrѓt do launchera" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Zapis:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1204,12 +1222,12 @@ msgstr "" "dowiedzieц jak szukaц dalszej pomocy, sprawdМ plik README." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~A~nuluj" @@ -1217,23 +1235,23 @@ msgstr "~A~nuluj" msgid "~K~eys" msgstr "~K~lawisze" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Nie udaГo siъ zainicjalizowaц formatu kolorѓw." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Nie udaГo siъ przeГБczyц w tryb wideo: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Nie udaГo siъ zastosowaц ustawienia formatu obrazu." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Nie udaГo siъ zastosowaц ustawienia peГnego ekranu." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1245,7 +1263,7 @@ msgstr "" "znane problemѓw. StБd zalecane jest skopiowanie plikѓw gry na twardy dysk.\n" "Dalsze informacje sБ dostъpne w pliku README." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1257,7 +1275,7 @@ msgstr "" "skopiowaц na dysk za pomocБ odpowiedniego rippera CD audio.\n" "Dalsze informacje sБ dostъpne w pliku README." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1266,7 +1284,7 @@ msgstr "" "Odczyt stanu gry nie powiѓdГ siъ (%s)! Aby uzyskaц podstawowe informacje " "oraz dowiedzieц jak szukaц dalszej pomocy, sprawdМ plik README." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1276,28 +1294,51 @@ msgstr "" "ScummVM. W zwiБzku z tym moПe byц ona niestabilna, a wszelkie zapisy, " "ktѓrych dokonasz, mogБ byц nieobsГugiwane w przyszГych wersjach ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "WГБcz mimo tego" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu zamiast tych ze ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Wznѓw grъ:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Wznѓw" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM znalazГ stare zapisy z Broken Sword 1, ktѓre naleПy " +"przekonwertowaц.\n" +"Stary format zapisu nie jest juП obsГugiwany. Nie bъdziesz mѓgГ wczytaц " +"zapisѓw, jeЖli ich nie przekonwertujesz.\n" +"\n" +"NaciЖnij OK, Пeby je teraz przekonwertowaц. W przeciwnym wypadku zostaniesz " +"zapytany ponownie przy nastъpnym wГБczeniu gry.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "UПyj trybu jasnej palety" @@ -2009,7 +2050,7 @@ msgstr "Leц w prawo" msgid "Fly to lower right" msgstr "Leц w dѓГ, w prawo" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2018,7 +2059,7 @@ msgstr "" "Natywne wsparcie MIDI wymaga aktualizacji Rolanda od LucasArts,\n" "ale brakuje %s. PrzeГБczam na tryb AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2029,7 +2070,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2040,7 +2081,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2051,7 +2092,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2062,7 +2103,7 @@ msgstr "" "ScummVM i wybierz podkatalog \"Maniac\" z katalogu gry Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~T~ryb turbo aktywny" @@ -2083,7 +2124,7 @@ msgstr "~P~okaП mapъ" msgid "~M~ain Menu" msgstr "~M~enu gГѓwne" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~E~fekty wody wГБczone" @@ -2105,6 +2146,15 @@ msgstr "Nie udaГo siъ zapisaц stanu gry do pliku." msgid "Failed to delete file." msgstr "Nie udaГo siъ usunБц pliku." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Tryb szybki" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Nie udaГo siъ zapisaц stanu gry" @@ -2466,11 +2516,11 @@ msgstr "Emulator Apple II GS (NIE ZAIMPLEMENTOWANY)" msgid "C64 Audio Emulator" msgstr "Emulator dМwiъku C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Inicjalizacja emulatora MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Emulator MT-32" @@ -2652,12 +2702,12 @@ msgid "Normal (no scaling)" msgstr "ZwykГy (bez skalowania)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "WГБczono korekcjъ formatu obrazu" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "WyГБczono korekcjъ formatu obrazu" @@ -2666,7 +2716,7 @@ msgid "Active graphics filter:" msgstr "Aktywny filtr graficzny:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Okno" @@ -2690,11 +2740,11 @@ msgstr "Obecny tryb wideo" msgid "Current scale" msgstr "Aktualne powiъkszenie" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktywny tryb filtru: dwuliniowy" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktywny tryb filtru: najbliПszy sБsiad" @@ -3091,6 +3141,9 @@ msgstr "Klikanie wГБczone" msgid "Clicking Disabled" msgstr "Klikanie wyГБczone" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "WГБcz tryb Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Zielony Hercules" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0225854de6..5ec84ec01f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2011-10-21 21:30-0300\n" "Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n" "Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n" @@ -33,32 +33,42 @@ msgstr "Funчѕes compiladas em:" msgid "Available engines:" msgstr "Programas disponэveis:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Mostrar / Ocultar console" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Acima" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Ir para o diretѓrio anterior" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Acima" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Escolher" @@ -95,17 +105,18 @@ msgid "Map" msgstr "Mapear" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -176,8 +187,8 @@ msgid "" "English" msgstr "Idioma do jogo. Isto nуo irс passar seu jogo Inglъs para Portuguъs" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<padrуo>" @@ -200,11 +211,11 @@ msgstr "Sistema:" msgid "Engine" msgstr "Examinar" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -217,7 +228,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Сudio" @@ -230,11 +241,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -248,7 +259,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -261,7 +272,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -274,11 +285,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Pastas" @@ -292,7 +303,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Pasta de Extras" @@ -300,42 +311,42 @@ msgstr "Pasta de Extras" msgid "Specifies path to additional data used the game" msgstr "Especifique a pasta para dados utilizados no jogo" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Pasta para Salvar" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Pasta para Salvar" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Nenhum(a)" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Selecione o SoundFont" @@ -541,133 +552,133 @@ msgstr "" "Encontrado(s) %d novo(s) jogo(s, ignorados %d previamente adicionados " "jogos..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "a cada 5 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "a cada 10 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "a cada 15 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "a cada 30 mins" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Nenhum(a)" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Falha ao aplicar algumas mudanчas nas opчѕes de grсfico:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "o modo de vэdeo nуo pєde ser alterado." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "a configuraчуo de tela cheia nуo pєde ser mudada" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "a configuraчуo de proporчуo nуo pєde ser mudada" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Renderizaчуo" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Correчуo de proporчуo" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Correчуo de proporчуo para jogos 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 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:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 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:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib щ utilizado para mњsica em vсrios jogos" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -675,62 +686,66 @@ msgstr "" "Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado " "por sua placa de som" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 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:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Nуo usar mњsica General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Usar o primeiro dispositivo disponэvel" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Mixar AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar MIDI e AdLib juntos na geraчуo de som" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Ganho MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Dispositivo MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -738,193 +753,194 @@ msgstr "" "Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel " "com Roland" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sem emulaчуo GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Ligar modo Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Nуo usar mњsica Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Legendas" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Rapidez legendas:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Legs" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Mostrar legenda e vozes (dublagem)" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade das legendas:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Mudo" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volume dos efeitos sonoros especiais" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Renderizador GUI:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Idioma do GUI:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Linguagem do ScummVM GUI" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Vocъ tem que reiniciar o ScummVM para funcionar." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Selecione a pasta para o jogos salvos" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Selecione a pasta para os plugins" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1183,13 +1199,15 @@ msgid "~R~eturn to Launcher" msgstr "~V~oltar ao menu" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Salvar jogo:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1219,12 +1237,12 @@ msgstr "" "instruчѕes sobre como obter assistъncia adicional." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "~C~ancelar" @@ -1232,23 +1250,23 @@ msgstr "~C~ancelar" msgid "~K~eys" msgstr "~T~eclas" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Nуo foi possэvel inicializar o formato de cor." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Nуo foi possэvel alternar o modo de vэdeo atual:" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Nуo foi possэvel aplicar a correчуo de proporчуo" -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Nуo foi possэvel aplicar a configuraчуo de tela cheia." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1262,7 +1280,7 @@ msgstr "" "os arquivos de dados para o disco rэgido.\n" "Consulte o arquivo README para mais detalhes." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1276,7 +1294,7 @@ msgstr "" "para ouvir a mњsica do jogo.\n" "Consulte o arquivo README para mais detalhes." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, fuzzy, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1286,7 +1304,7 @@ msgstr "" "Por favor, consulte o README para obter informaчѕes bсsicas, e para obter " "instruчѕes sobre como obter assistъncia adicional." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1296,28 +1314,51 @@ msgstr "" "suportado pelo ScummVM. Como tal, щ provсvel que seja instсvel, e qualquer " "jogo salvo que vocъ fizer pode nуo funcionar em futuras versѕes do ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Iniciar de qualquer maneira" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Restaurar jogo:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Restaurar" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM encontrou que vocъ tem jogos salvos velhos do Broken Sword 1 que " +"devem ser convertidos.\n" +"O formato antigo do jogo salvo nуo щ mais suportado, entуo vocъ nуo serс " +"capaz de carregar os seus jogos se vocъ nуo convertъ-los.\n" +"\n" +"Pressione OK para convertъ-los agora, caso contrсrio vocъ serс solicitado " +"novamente na prѓxima vez que vocъ iniciar o jogo.\n" + #: engines/dreamweb/detection.cpp:57 #, fuzzy msgid "Use bright palette mode" @@ -2030,7 +2071,7 @@ msgstr "Voar para direita" msgid "Fly to lower right" msgstr "Voar para direita inferior" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2040,7 +2081,7 @@ msgstr "" "LucasArts,\n" "mas %s estс faltando. Utilizando AdLib ao invщs." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2051,7 +2092,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2062,7 +2103,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2073,7 +2114,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2085,7 +2126,7 @@ msgstr "" "dentro da pasta do jogo Day of the Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Modo ~Z~ip ativado" @@ -2106,7 +2147,7 @@ msgstr "~E~xibir Mapa" msgid "~M~ain Menu" msgstr "~M~enu Principal ScummVM" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Modo ~E~feitos de сgua ativado" @@ -2134,6 +2175,15 @@ msgstr "" msgid "Failed to delete file." msgstr "Falha ao excluir arquivo." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Modo rсpido" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Falha ao salvar o jogo" @@ -2504,11 +2554,11 @@ msgstr "Emulador Apple II GS (NУO IMPLEMENTADO)" msgid "C64 Audio Emulator" msgstr "Emulador Som C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Inicializando Emulador MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Emulador MT-32" @@ -2692,12 +2742,12 @@ msgid "Normal (no scaling)" msgstr "Normal (sem escala)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Correчуo de proporчуo habilitada" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Correчуo de proporчуo desabilitada" @@ -2706,7 +2756,7 @@ msgid "Active graphics filter:" msgstr "Ativa os filtros grсficos" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Modo janela" @@ -2730,11 +2780,11 @@ msgstr "Modo de vэdeo atual" msgid "Current scale" msgstr "Escala atual" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Filtro de imagem ativo: Linear" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Filtro de imagem ativo: Nearest" @@ -3134,6 +3184,9 @@ msgstr "Clicando Habilitado" msgid "Clicking Disabled" msgstr "Clicando Desabilitado" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Ligar modo Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules Green" diff --git a/po/ru_RU.po b/po/ru_RU.po index 3140b41f50..e57da2da3f 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-08 22:00+0200+0200\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" @@ -31,32 +31,42 @@ msgstr "Включенные в билд опции:" msgid "Available engines:" msgstr "Доступные движки:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Показать / Убрать консоль" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Перейти на директорию уровнем выше" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Отмена" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Выбрать" @@ -92,17 +102,18 @@ msgid "Map" msgstr "Назначить" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -174,8 +185,8 @@ msgid "" msgstr "" "Язык игры. Изменение этой настройки не превратит игру на английском в русскую" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<по умолчанию>" @@ -197,11 +208,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Графика" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "Грф" @@ -214,7 +225,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Аудио" @@ -227,11 +238,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Громкость" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Громк" @@ -245,7 +256,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -258,7 +269,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -271,11 +282,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Пути" @@ -289,7 +300,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Где игра:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Доп. путь:" @@ -297,42 +308,42 @@ msgstr "Доп. путь:" msgid "Specifies path to additional data used the game" msgstr "Указывает путь к дополнительным файлам данных для игры" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Сохранения игр:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Указывает путь к сохранениям игры" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Путь сохр:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Не задан" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "По умолчанию" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Выберите SoundFont" @@ -531,134 +542,134 @@ msgstr "Просмотрено %d директорий ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Найдено %d новых игр, пропущено %d ранее добавленных игр ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Никогда" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "каждые 5 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "каждые 10 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "каждые 15 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "каждые 30 минут" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Не задан" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Не удалось применить изменения некторых графических настроек:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "видеорежим не может быть изменён." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "полноэкранный режим не может быть изменён" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "режим корректировки соотношения сторон не может быть изменён" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Граф. режим:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Режим растра:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Полноэкранный режим" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Коррекция соотношения сторон" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Корректировать соотношение сторон для игр с разрешением 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Предпочитаемое:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Предпочитаемое:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Эмулятор AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "Звуковая карта AdLib используется многими играми" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Частота звука:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -666,63 +677,67 @@ msgstr "" "БОльшие значения задают лучшее качество звука, однако они могут не " "поддерживаться вашей звуковой картой" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Устройство GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Указывает выходное звуковое устройство для MIDI" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Не использовать музыку для General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Использовать первое доступное устройство" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFontы поддерживаются некоторыми звуковыми картами, Fluidsynth и Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Смешанный режим AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Использовать и MIDI и AdLib для генерации звука" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Усиление MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Устр. MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Указывает звуковое устройство по умолчанию для вывода на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -730,194 +745,195 @@ msgstr "" "Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы " "хотите его использовать" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Настоящий Roland MT-32 (запретить GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Включить режим Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Выключает сопоставление General MIDI для игр с звуковой дорожкой для Roland " "MT-32" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Не использовать музыку для MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Субтитры" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Оба" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Оба" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Показывать субтитры и воспроизводить речь" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Выкл. всё" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Громкость SFX:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Громкость специальных звуковых эффектов" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Громк. SFX:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Путь к темам:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Где темы:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Указывает путь к дополнительным файлам данных, используемых всеми играми, " "либо ScummVM" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Рисовалка GUI:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Автосохранение:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Автосохр.:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Клавиши" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Язык GUI:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Язык графического интерфейса ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы должны перезапустить ScummVM чтобы применить изменения." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Выберите директорию для сохранений" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Выберите директорию для тем GUI" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Выберите директорию с дополнительными файлами" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Выберите директорию с плагинами" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1171,13 +1187,15 @@ msgid "~R~eturn to Launcher" msgstr "~В~ главное меню" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Сохранить игру:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1207,12 +1225,12 @@ msgstr "" "помощь." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "О~т~мена" @@ -1220,23 +1238,23 @@ msgstr "О~т~мена" msgid "~K~eys" msgstr "~К~лавиши" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Не могу инициализировать формат цвета." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Не удалось переключить видеорежим: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Не удалось использовать коррекцию соотношения сторон." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Не могу применить полноэкранный режим." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1250,7 +1268,7 @@ msgstr "" "на жёсткий диск. Подробности можно найти в\n" "файле README." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1265,7 +1283,7 @@ msgstr "" "появится музыка. Подробности можно найти в\n" "файле README." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1275,7 +1293,7 @@ msgstr "" "README за базовой информацией, а также инструкциями о том, как получить " "дальнейшую помощь." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1285,30 +1303,52 @@ msgstr "" "ScummVM полностью. Она скорее всего не будет работать стабильно, и " "сохранения игр могут не работать в будущих версиях ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Всё равно запустить" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Использовать оригинальные экраны записи/чтения игры" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Использовать оригинальные экраны записи и сохранения игры вместо сделанных в " "ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Восстановить игру:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Восстановить" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM обнаружил у вас сохранения игры Сломанный Меч в старом формате.\n" +"Старый формат больше не поддерживается, и чтобы загрузить сохранения, они " +"должны быть переведены в новый формат.\n" +"\n" +"Нажмите ОК, чтобы перевести их в новый формат сейчас, в противном случае это " +"сообщение появится снова при следующем запуске игры.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Использовать режим яркой палитры" @@ -2024,7 +2064,7 @@ msgstr "Лететь вправо" msgid "Fly to lower right" msgstr "Лететь вправо-вниз" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2033,7 +2073,7 @@ msgstr "" "Режим \"родного\" MIDI требует обновление Roland Upgrade от\n" "LucasArts, но не хватает %s. Переключаюсь на AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2044,7 +2084,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2055,7 +2095,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2066,7 +2106,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2077,7 +2117,7 @@ msgstr "" "выберите директорию Maniac внутри директории с игрой Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Режим быстрого перехода активирован" @@ -2098,7 +2138,7 @@ msgstr "Показать карту" msgid "~M~ain Menu" msgstr "Главное меню" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Эффекты воды включены" @@ -2120,6 +2160,15 @@ msgstr "Не удалось сохранить игру в файл." msgid "Failed to delete file." msgstr "Не удалось удалить файл." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Быстрый режим" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Не удалось сохранить игру" @@ -2481,11 +2530,11 @@ msgstr "Эмулятор Apple II GS (отсутствует)" msgid "C64 Audio Emulator" msgstr "Эмулятор звука C64" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Настраиваю эмулятор MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Эмулятор MT-32" @@ -2667,12 +2716,12 @@ msgid "Normal (no scaling)" msgstr "Без увеличения" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Коррекция соотношения сторон включена" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Коррекция соотношения сторон выключена" @@ -2681,7 +2730,7 @@ msgid "Active graphics filter:" msgstr "Активный графический фильтр:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Оконный режим" @@ -2705,11 +2754,11 @@ msgstr "Текущий видеорежим" msgid "Current scale" msgstr "Текущий масштаб" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Активный режим фильтра: Линейный" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Активный режим фильтра: Ближайший" @@ -3106,6 +3155,9 @@ msgstr "Щелчки включены" msgid "Clicking Disabled" msgstr "Щелчки выключены" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Включить режим Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules Зелёный" diff --git a/po/scummvm.pot b/po/scummvm.pot index fb56e89dce..0d7d4a7ead 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\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" @@ -30,32 +30,41 @@ msgstr "" msgid "Available engines:" msgstr "" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +msgid "Show hidden files" +msgstr "" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "" @@ -91,17 +100,18 @@ msgid "Map" msgstr "" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "" @@ -170,8 +180,8 @@ msgid "" "English" msgstr "" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "" @@ -193,11 +203,11 @@ msgstr "" msgid "Engine" msgstr "" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "" @@ -210,7 +220,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "" @@ -223,11 +233,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "" @@ -241,7 +251,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "" @@ -254,7 +264,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "" @@ -267,11 +277,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "" @@ -285,7 +295,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "" @@ -293,42 +303,42 @@ msgstr "" msgid "Specifies path to additional data used the game" msgstr "" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "" @@ -525,381 +535,385 @@ msgstr "" msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" +#: gui/options.cpp:890 +msgid "Roland GS Mode (disable GM mapping)" msgstr "" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "" -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1150,13 +1164,15 @@ msgid "~R~eturn to Launcher" msgstr "" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1180,12 +1196,12 @@ msgid "" msgstr "" #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "" @@ -1193,23 +1209,23 @@ msgstr "" msgid "~K~eys" msgstr "" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "" -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "" -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "" -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1218,7 +1234,7 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1227,42 +1243,57 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "" +#: engines/drascula/saveload.cpp:49 +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "" @@ -1970,14 +2001,14 @@ msgstr "" msgid "Fly to lower right" msgstr "" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1985,7 +2016,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1993,7 +2024,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2001,7 +2032,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2009,7 +2040,7 @@ msgid "" msgstr "" #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "" @@ -2030,7 +2061,7 @@ msgstr "" msgid "~M~ain Menu" msgstr "" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "" @@ -2052,6 +2083,14 @@ msgstr "" msgid "Failed to delete file." msgstr "" +#: engines/groovie/detection.cpp:312 +msgid "Fast movie speed" +msgstr "" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "" @@ -2369,11 +2408,11 @@ msgstr "" msgid "C64 Audio Emulator" msgstr "" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "" @@ -2555,12 +2594,12 @@ msgid "Normal (no scaling)" msgstr "" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "" @@ -2569,7 +2608,7 @@ msgid "Active graphics filter:" msgstr "" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "" @@ -2593,11 +2632,11 @@ msgstr "" msgid "Current scale" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "" diff --git a/po/se_SE.po b/po/se_SE.po index 1eb6ffa4a3..d7f635a5e9 100644 --- a/po/se_SE.po +++ b/po/se_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-07-08 18:03+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" @@ -33,32 +33,42 @@ msgstr "Funktioner kompilerade i:" msgid "Available engines:" msgstr "Tillgфngliga motorer" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Visa / gіm konsol" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Uppхt" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Gх till fіregхende katalognivх" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Uppхt" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vфlj" @@ -94,17 +104,18 @@ msgid "Map" msgstr "Stфll in" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -177,8 +188,8 @@ msgstr "" "Spelets sprхk. Den hфr instфllningen omvandlar inte din spanska spelversion " "till en engelsk" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" @@ -200,11 +211,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "GFX" @@ -217,7 +228,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Ljud" @@ -230,11 +241,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Volym" @@ -248,7 +259,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -261,7 +272,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -274,11 +285,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Sіkvфgar" @@ -292,7 +303,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Sіkv. extra:" @@ -300,42 +311,42 @@ msgstr "Sіkv. extra:" 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:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Bestфmmer var dina spardata lagras" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Vфlj SoundFont" @@ -535,133 +546,133 @@ msgstr "Kataloger scannade: %d ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Upptфckte %d nya spel, ignorerade %d tidigare tillagda spel ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "var 5:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "var 10:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "var 15:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "var 30:e minut" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Kunde inte verkstфlla nхgra av grafikinstфllningarna:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "videolфget kunde inte фndras." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "fullskфrmsinstфllningen kunde inte фndras." -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras." -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Grafiklфge:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Renderingslфge:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlфgen stіdda av vissa spel" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Fullskфrmslфge" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Korrektion av bildfіrhхllande" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrigerar bildfіrhхllanden fіr 320x200-spel" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Fіredragen enhet:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fіredr. enhet:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "AdLib anvфnds fіr musik i mхnga spel" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Ljudfrekvens:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -669,61 +680,65 @@ msgstr "" "Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt " "ljudkort" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Anvфnd inte General MIDI-musik" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Anvфnd fіrsta tillgфngliga enhet" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 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:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Blandat AdLib/MIDI-lфge" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "MT-32 enhet:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 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:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -731,193 +746,194 @@ msgstr "" "Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-" "anslutna ljudenhet" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Фkta Roland MT-32 (ingen GM-emulation)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Aktivera Roland GS-lфge" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 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:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Anvфnd inte Roland MT-32 musik" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Undertext och tal:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Tal" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Undertexter" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Bхda" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text och tal:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Tal" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Text" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Bхda" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Visa undertexter och spela upp tal" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Ljud av" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Volym fіr specialeffekter" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 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:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "GUI-rendering:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Tangenter" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 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:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Vфlj katalog fіr spardata" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 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:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Vфlj katalog fіr GUI-teman" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Vфlj katalog fіr extra filer" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Vфlj katalog fіr tillфgg" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1174,13 +1190,15 @@ msgid "~R~eturn to Launcher" msgstr "Хte~r~vфnd till launcher" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Spara spelet:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1207,12 +1225,12 @@ msgid "" msgstr "Spar" #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "A~v~bryt" @@ -1220,23 +1238,23 @@ msgstr "A~v~bryt" msgid "~K~eys" msgstr "~T~angenter" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Kunde inte initialisera fфrgformat." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Kunde inte byta till videolфget: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Kunde inte фndra instфllningen fіr bildfіrhхllanden." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Kunde inte applicera fullskфrmsinstфllning." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1250,7 +1268,7 @@ msgstr "" "datafilerna till din hхrddisk istфllet.\n" "Se README-filen fіr detaljer." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1264,7 +1282,7 @@ msgstr "" "fіr att kunna lyssna pх spelets musik.\n" "Se README-filen fіr detaljer." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1273,7 +1291,7 @@ msgstr "" "Kunde inte ladda spardata (%s)! Hфnvisa till README-filen fіr grundlфggande " "information och instruktioner fіr ytterligare assistans." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1283,28 +1301,51 @@ msgstr "" "ScummVM. Dфrfіr фr det troligtvis instabilt och om du skapar spardata kan de " "mіjligtvis vara inkompatibla med framtida versioner av ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Starta фndх" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Anvфnd originalskфrmar fіr spara/ladda" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Anvфnder originalskфrmarna fіr spara/ladda istфllet fіr ScummVM:s" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Хterstфll spel:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Хterstфll" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM upptфckte att du har gamla spardata fіr Broken Sword 1 som borde " +"konverteras.\n" +"Det gamla spardataformatet stіds inte lфngre, sх du kommer inte kunna ladda " +"dina data om du inte konverterar dem.\n" +"\n" +"Tryck \"OK\" fіr att konvertera dem nu, annars kommer du tillfrхgas igen " +"nфsta gхng du startar spelet.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Anvфnd ljus palett-lфge" @@ -2016,7 +2057,7 @@ msgstr "Flyg хt hіger" msgid "Fly to lower right" msgstr "Flyg хt nedre hіger" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2025,7 +2066,7 @@ msgstr "" "Stіd fіr Native MIDI krфver Roland-uppdateringen frхn LucasArts,\n" "men %s saknas. Anvфnder AdLib istфllet." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2036,7 +2077,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2047,7 +2088,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2058,7 +2099,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2069,7 +2110,7 @@ msgstr "" "och vфlj \"Maniac\"-katalogen inuti \"Tentacle\" katalogen." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "~Z~iplфge aktiverat" @@ -2090,7 +2131,7 @@ msgstr "~V~isa karta" msgid "~M~ain Menu" msgstr "Huvud~m~eny" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "~V~atteneffekt aktiverad" @@ -2112,6 +2153,15 @@ msgstr "Kunde inte skriva spardata till filen." msgid "Failed to delete file." msgstr "Kunde inte radera filen." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Snabblфge" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Kunde inte spara spelet." @@ -2469,11 +2519,11 @@ msgstr "Apple II GS-emulator (INTE IMPLEMENTERAD)" msgid "C64 Audio Emulator" msgstr "C64 ljudemulator" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32 emulator" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "MT-32 emulator" @@ -2655,12 +2705,12 @@ msgid "Normal (no scaling)" msgstr "Normalt (ingen skalning)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Korrektion av bildfіrhхllande pх" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Korrektion av bildfіrhхllande av" @@ -2669,7 +2719,7 @@ msgid "Active graphics filter:" msgstr "Aktivt grafikfilter:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Fіnsterlфge" @@ -2693,11 +2743,11 @@ msgstr "Nuvarande visningslфge" msgid "Current scale" msgstr "Nuvarande skala" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Aktivt filterlфge: Linjфrt" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Aktivt filterlфge: Nфrmast" @@ -3097,6 +3147,9 @@ msgstr "Klickning aktiverad" msgid "Clicking Disabled" msgstr "Klickning deaktiverad" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Aktivera Roland GS-lфge" + #~ msgid "Hercules Green" #~ msgstr "Herkules grіn" diff --git a/po/uk_UA.po b/po/uk_UA.po index 3b6ccd266f..5a0e32ea5d 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-12-01 17:22+0000\n" +"POT-Creation-Date: 2013-02-03 00:06+0000\n" "PO-Revision-Date: 2012-06-29 20:19+0200\n" "Last-Translator: lubomyr <lubomyr31@gmail.com>\n" "Language-Team: Ukrainian\n" @@ -31,32 +31,42 @@ msgstr "Включені в білд опції:" msgid "Available engines:" msgstr "Доступні движки:" -#: gui/browser.cpp:66 +#: gui/browser.cpp:67 +#, fuzzy +msgid "Show hidden files" +msgstr "Показати / cховати консоль" + +#: gui/browser.cpp:67 +msgid "Show files marked with the hidden attribute" +msgstr "" + +#: gui/browser.cpp:71 msgid "Go up" msgstr "Вгору" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:71 gui/browser.cpp:73 msgid "Go to previous directory level" msgstr "Перейти на папку рівнем вище" -#: gui/browser.cpp:68 +#: gui/browser.cpp:73 msgctxt "lowres" msgid "Go up" msgstr "Вгору" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/browser.cpp:74 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:215 gui/saveload-dialog.cpp:275 #: gui/saveload-dialog.cpp:545 gui/saveload-dialog.cpp:919 -#: gui/themebrowser.cpp:54 engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 engines/sword1/control.cpp:867 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:48 +#: gui/themebrowser.cpp:54 engines/engine.cpp:447 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:867 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Відміна" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Вибрати" @@ -92,17 +102,18 @@ msgid "Map" msgstr "Призначити" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: gui/saveload-dialog.cpp:920 engines/engine.cpp:361 engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 engines/scumm/scumm.cpp:1776 -#: engines/agos/animation.cpp:558 engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:519 engines/sword1/animation.cpp:540 -#: engines/sword1/animation.cpp:550 engines/sword1/animation.cpp:557 -#: engines/sword1/control.cpp:867 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:419 engines/sword2/animation.cpp:439 -#: engines/sword2/animation.cpp:449 engines/sword2/animation.cpp:458 -#: engines/parallaction/saveload.cpp:274 backends/platform/wii/options.cpp:47 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1239 +#: gui/saveload-dialog.cpp:920 engines/engine.cpp:366 engines/engine.cpp:377 +#: engines/drascula/saveload.cpp:51 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1778 engines/agos/animation.cpp:558 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:519 +#: engines/sword1/animation.cpp:540 engines/sword1/animation.cpp:550 +#: engines/sword1/animation.cpp:557 engines/sword1/control.cpp:867 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:419 +#: engines/sword2/animation.cpp:439 engines/sword2/animation.cpp:449 +#: engines/sword2/animation.cpp:458 engines/parallaction/saveload.cpp:274 +#: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" msgstr "OK" @@ -175,8 +186,8 @@ msgstr "" "Мова гри. Зміна цього налаштування не перетворить гру англійською на " "українську" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:86 +#: gui/options.cpp:736 gui/options.cpp:749 gui/options.cpp:1209 #: audio/null.cpp:40 msgid "<default>" msgstr "<за умовчанням>" @@ -198,11 +209,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1072 gui/options.cpp:1089 msgid "GFX" msgstr "Грф" @@ -215,7 +226,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1095 msgid "Audio" msgstr "Аудіо" @@ -228,11 +239,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1100 msgid "Volume" msgstr "Гучність" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1102 msgctxt "lowres" msgid "Volume" msgstr "Гучн." @@ -246,7 +257,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1110 msgid "MIDI" msgstr "MIDI" @@ -259,7 +270,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1116 msgid "MT-32" msgstr "MT-32" @@ -272,11 +283,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1123 msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1125 msgctxt "lowres" msgid "Paths" msgstr "Шляхи" @@ -290,7 +301,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Шлях до гри:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1149 msgid "Extra Path:" msgstr "Додатк. шлях:" @@ -298,42 +309,42 @@ msgstr "Додатк. шлях:" msgid "Specifies path to additional data used the game" msgstr "Вказує шлях до додаткових файлів даних для гри" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1151 msgctxt "lowres" msgid "Extra Path:" msgstr "Дод. шлях:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1133 msgid "Save Path:" msgstr "Шлях збер.:" #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/options.cpp:1133 gui/options.cpp:1135 gui/options.cpp:1136 msgid "Specifies where your savegames are put" msgstr "Вказує шлях до збережень гри" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1135 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях збер.:" #: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 -#: gui/options.cpp:1423 +#: gui/launcher.cpp:565 gui/options.cpp:1144 gui/options.cpp:1152 +#: gui/options.cpp:1161 gui/options.cpp:1276 gui/options.cpp:1282 +#: gui/options.cpp:1290 gui/options.cpp:1320 gui/options.cpp:1326 +#: gui/options.cpp:1333 gui/options.cpp:1426 gui/options.cpp:1429 +#: gui/options.cpp:1441 msgctxt "path" msgid "None" msgstr "Не завданий" #: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/options.cpp:1270 gui/options.cpp:1314 gui/options.cpp:1432 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "За умовчанням" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1435 msgid "Select SoundFont" msgstr "Виберіть SoundFont" @@ -532,133 +543,133 @@ msgstr "Проглянуто %d папок ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Знайдено %d нових ігор, пропущено %d попередньо доданих ігор ..." -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "Never" msgstr "Ніколи" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 5 mins" msgstr "кожні 5 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 10 mins" msgstr "кожні 10 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 15 mins" msgstr "кожні 15 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:84 msgid "every 30 mins" msgstr "кожні 30 хв" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:80 +#: gui/options.cpp:86 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:254 gui/options.cpp:480 gui/options.cpp:581 +#: gui/options.cpp:650 gui/options.cpp:858 msgctxt "soundfont" msgid "None" msgstr "Не заданий" -#: gui/options.cpp:382 +#: gui/options.cpp:388 msgid "Failed to apply some of the graphic options changes:" msgstr "Не вдалося застосувати деякі зі змін графічних налаштувань:" -#: gui/options.cpp:394 +#: gui/options.cpp:400 msgid "the video mode could not be changed." msgstr "не вдалося змінити графічний режим." -#: gui/options.cpp:400 +#: gui/options.cpp:406 msgid "the fullscreen setting could not be changed" msgstr "не вдалося змінити режим повного екрану" -#: gui/options.cpp:406 +#: gui/options.cpp:412 msgid "the aspect ratio setting could not be changed" msgstr "не вдалося змінити режим корекції співвідношення сторін" -#: gui/options.cpp:727 +#: gui/options.cpp:733 msgid "Graphics mode:" msgstr "Графічн. режим:" -#: gui/options.cpp:741 +#: gui/options.cpp:747 msgid "Render mode:" msgstr "Режим раструв.:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:747 gui/options.cpp:748 msgid "Special dithering modes supported by some games" msgstr "Спеціальні режими растрування, які підтримують деякі ігри" -#: gui/options.cpp:753 +#: gui/options.cpp:759 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2236 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:476 msgid "Fullscreen mode" msgstr "Повноекранний режим" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Aspect ratio correction" msgstr "Корекція співвідношення сторін" -#: gui/options.cpp:756 +#: gui/options.cpp:762 msgid "Correct aspect ratio for 320x200 games" msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Preferred Device:" msgstr "Уподобаний пристрій:" -#: gui/options.cpp:764 +#: gui/options.cpp:770 msgid "Music Device:" msgstr "Музич. пристрій:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:770 gui/options.cpp:772 msgid "Specifies preferred sound device or sound card emulator" msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:770 gui/options.cpp:772 gui/options.cpp:773 msgid "Specifies output sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Уподоб. пристрій:" -#: gui/options.cpp:766 +#: gui/options.cpp:772 msgctxt "lowres" msgid "Music Device:" msgstr "Музичний пристрій:" -#: gui/options.cpp:793 +#: gui/options.cpp:799 msgid "AdLib emulator:" msgstr "Емулятор AdLib:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:799 gui/options.cpp:800 msgid "AdLib is used for music in many games" msgstr "Звукова карта AdLib використовується багатьма іграми" -#: gui/options.cpp:804 +#: gui/options.cpp:810 msgid "Output rate:" msgstr "Вихідна частота:" -#: gui/options.cpp:804 gui/options.cpp:805 +#: gui/options.cpp:810 gui/options.cpp:811 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -666,63 +677,67 @@ msgstr "" "Великі значення задають кращу якість звуку, проте вони можуть не " "підтримуватися вашою звуковою картою" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "GM Device:" msgstr "Пристрій GM:" -#: gui/options.cpp:815 +#: gui/options.cpp:821 msgid "Specifies default sound device for General MIDI output" msgstr "Вказує вихідний звуковий пристрій для General MIDI" -#: gui/options.cpp:826 +#: gui/options.cpp:832 msgid "Don't use General MIDI music" msgstr "Не використовувати музику General MIDI" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:843 gui/options.cpp:909 msgid "Use first available device" msgstr "Використовувати перший наявний пристрій" -#: gui/options.cpp:849 +#: gui/options.cpp:855 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:855 gui/options.cpp:857 gui/options.cpp:858 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont підтримується деякими звуковими картами, Fluidsynth та Timidity" -#: gui/options.cpp:851 +#: gui/options.cpp:857 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Mixed AdLib/MIDI mode" msgstr "Змішаний режим AdLib/MIDI" -#: gui/options.cpp:857 +#: gui/options.cpp:863 msgid "Use both MIDI and AdLib sound generation" msgstr "Використовувати і MIDI і AdLib для генерації звуку" -#: gui/options.cpp:860 +#: gui/options.cpp:866 msgid "MIDI gain:" msgstr "Посилення MIDI:" -#: gui/options.cpp:870 +#: gui/options.cpp:873 +msgid "FluidSynth Settings" +msgstr "" + +#: gui/options.cpp:880 msgid "MT-32 Device:" msgstr "Пристрій MT-32:" -#: gui/options.cpp:870 +#: gui/options.cpp:880 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Вказує звуковий пристрій за умовчанням для виводу на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:875 +#: gui/options.cpp:885 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:875 gui/options.cpp:877 +#: gui/options.cpp:885 gui/options.cpp:887 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -730,193 +745,194 @@ msgstr "" "Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви " "хочете його використовувати" -#: gui/options.cpp:877 +#: gui/options.cpp:887 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:880 -msgid "Enable Roland GS Mode" -msgstr "Увімкнути режим Roland GS" +#: gui/options.cpp:890 +#, fuzzy +msgid "Roland GS Mode (disable GM mapping)" +msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:880 +#: gui/options.cpp:890 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Вимикає мапінг General MIDI для ігор зі звуковою доріжкою для Roland MT-32" -#: gui/options.cpp:889 +#: gui/options.cpp:899 msgid "Don't use Roland MT-32 music" msgstr "Не використовувати Roland MT-32" -#: gui/options.cpp:916 +#: gui/options.cpp:926 msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Subtitles" msgstr "Субтитри" -#: gui/options.cpp:922 +#: gui/options.cpp:932 msgid "Both" msgstr "Все" -#: gui/options.cpp:924 +#: gui/options.cpp:934 msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:926 +#: gui/options.cpp:936 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:930 +#: gui/options.cpp:940 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:931 +#: gui/options.cpp:941 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Both" msgstr "Все" -#: gui/options.cpp:932 +#: gui/options.cpp:942 msgid "Show subtitles and play speech" msgstr "Показувати субтитри і відтворювати мову" -#: gui/options.cpp:934 +#: gui/options.cpp:944 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:950 +#: gui/options.cpp:960 msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:952 +#: gui/options.cpp:962 msgctxt "lowres" msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:959 +#: gui/options.cpp:969 msgid "Mute All" msgstr "Вимкнути все" -#: gui/options.cpp:962 +#: gui/options.cpp:972 msgid "SFX volume:" msgstr "Гучність ефектів:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:972 gui/options.cpp:974 gui/options.cpp:975 msgid "Special sound effects volume" msgstr "Гучність спеціальних звукових ефектів" -#: gui/options.cpp:964 +#: gui/options.cpp:974 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. ефектів:" -#: gui/options.cpp:972 +#: gui/options.cpp:982 msgid "Speech volume:" msgstr "Гучність озвучки:" -#: gui/options.cpp:974 +#: gui/options.cpp:984 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. озвучки:" -#: gui/options.cpp:1131 +#: gui/options.cpp:1141 msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1133 +#: gui/options.cpp:1143 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1149 gui/options.cpp:1151 gui/options.cpp:1152 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Вказує шлях до додаткових файлів даних, які використовуються усіма іграми " "або ScummVM" -#: gui/options.cpp:1148 +#: gui/options.cpp:1158 msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1150 +#: gui/options.cpp:1160 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1169 msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1161 +#: gui/options.cpp:1171 msgctxt "lowres" msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1163 +#: gui/options.cpp:1173 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1167 +#: gui/options.cpp:1177 msgid "GUI Renderer:" msgstr "Растер. GUI:" -#: gui/options.cpp:1179 +#: gui/options.cpp:1189 msgid "Autosave:" msgstr "Автозбереження:" -#: gui/options.cpp:1181 +#: gui/options.cpp:1191 msgctxt "lowres" msgid "Autosave:" msgstr "Автозбереж.:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1199 msgid "Keys" msgstr "Клавіші" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "GUI Language:" msgstr "Мова інтерф.:" -#: gui/options.cpp:1196 +#: gui/options.cpp:1206 msgid "Language of ScummVM GUI" msgstr "Мова графічного інтерфейсу ScummVM" -#: gui/options.cpp:1347 +#: gui/options.cpp:1365 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Ви повинні перезапустити ScummVM щоб застосувати зміни." -#: gui/options.cpp:1360 +#: gui/options.cpp:1378 msgid "Select directory for savegames" msgstr "Виберіть папку для збережень" -#: gui/options.cpp:1367 +#: gui/options.cpp:1385 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу." -#: gui/options.cpp:1376 +#: gui/options.cpp:1394 msgid "Select directory for GUI themes" msgstr "Виберіть папку для тем GUI" -#: gui/options.cpp:1386 +#: gui/options.cpp:1404 msgid "Select directory for extra files" msgstr "Виберіть папку з додатковими файлами" -#: gui/options.cpp:1397 +#: gui/options.cpp:1415 msgid "Select directory for plugins" msgstr "Виберіть папку зі втулками" -#: gui/options.cpp:1450 +#: gui/options.cpp:1468 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." @@ -1169,13 +1185,15 @@ msgid "~R~eturn to Launcher" msgstr "~П~овер.в головне меню" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:742 engines/toltecs/menu.cpp:284 msgid "Save game:" msgstr "Зберегти гру: " #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:742 +#: engines/drascula/saveload.cpp:338 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:742 +#: engines/toltecs/menu.cpp:284 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1204,12 +1222,12 @@ msgstr "" "основної інормації, а також інструкцій, як отримати подальшу допомогу." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:174 +#: engines/mohawk/dialogs.cpp:170 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:175 +#: engines/mohawk/dialogs.cpp:171 msgid "~C~ancel" msgstr "Ві~д~міна" @@ -1217,23 +1235,23 @@ msgstr "Ві~д~міна" msgid "~K~eys" msgstr "~К~лавіші" -#: engines/engine.cpp:235 +#: engines/engine.cpp:240 msgid "Could not initialize color format." msgstr "Не можу налаштувати формат кольору." -#: engines/engine.cpp:243 +#: engines/engine.cpp:248 msgid "Could not switch to video mode: '" msgstr "Не вдалося переключити відеорежим: '" -#: engines/engine.cpp:252 +#: engines/engine.cpp:257 msgid "Could not apply aspect ratio setting." msgstr "Не вдалося застосувати корекцію співвідношення сторін." -#: engines/engine.cpp:257 +#: engines/engine.cpp:262 msgid "Could not apply fullscreen setting." msgstr "Не вдалося застосувати повноекранний режим." -#: engines/engine.cpp:357 +#: engines/engine.cpp:362 msgid "" "You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" @@ -1247,7 +1265,7 @@ msgstr "" "гри на жорсткий диск.\n" "Дивіться файл README для подальших інструкцій." -#: engines/engine.cpp:368 +#: engines/engine.cpp:373 msgid "" "This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" @@ -1261,7 +1279,7 @@ msgstr "" "того, щоб можна було слухати музику у грі.\n" "Дивіться файл README для подальших інструкцій." -#: engines/engine.cpp:426 +#: engines/engine.cpp:431 #, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " @@ -1270,7 +1288,7 @@ msgstr "" "Завантаження стану гри не вдалося (%s)! . Будь-ласка, дивіться файл README " "для основної інормації, а також інструкцій, як отримати подальшу допомогу." -#: engines/engine.cpp:439 +#: engines/engine.cpp:444 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1280,29 +1298,51 @@ msgstr "" "ScummVM. Скорше за все вона не буде працювати стабільно, і збереження ігор, " "які ви зробите, можуть не працювати у подальших версіях ScummVM." -#: engines/engine.cpp:442 +#: engines/engine.cpp:447 msgid "Start anyway" msgstr "Все одно запустити" -#: engines/agi/detection.cpp:142 engines/dreamweb/detection.cpp:47 -#: engines/sci/detection.cpp:393 +#: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:270 +#: engines/dreamweb/detection.cpp:47 engines/sci/detection.cpp:393 +#: engines/toltecs/detection.cpp:173 msgid "Use original save/load screens" msgstr "Використовувати ориг. збереження/завантаження екрани" -#: engines/agi/detection.cpp:143 engines/dreamweb/detection.cpp:48 -#: engines/sci/detection.cpp:394 +#: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:271 +#: engines/dreamweb/detection.cpp:48 engines/sci/detection.cpp:394 +#: engines/toltecs/detection.cpp:174 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Використовувати оригінальні збереження/завантаження екрани, замість ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore game:" msgstr "Відновити гру:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:838 +#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:351 +#: engines/sci/engine/kfile.cpp:838 engines/toltecs/menu.cpp:259 msgid "Restore" msgstr "Відновити" +#: engines/drascula/saveload.cpp:49 +#, fuzzy +msgid "" +"ScummVM found that you have old savefiles for Drascula that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM знайшов, що Ви маєте старі збереження ігор для Broken Sword 1.\n" +"Збереження у старому форматі не підтримуються, і Ви не зможете їх " +"завантажити, якщо не переведете у новий формат.\n" +"\n" +"Натисніть ОК, щоб перевести їх зараз, інакше уе повідомлення з'явиться при " +"наступному запуску гри.\n" + #: engines/dreamweb/detection.cpp:57 msgid "Use bright palette mode" msgstr "Використовувати яскравий режим палітри" @@ -2014,7 +2054,7 @@ msgstr "Летіти направо" msgid "Fly to lower right" msgstr "Летіти донизу направо" -#: engines/scumm/scumm.cpp:1774 +#: engines/scumm/scumm.cpp:1776 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -2023,7 +2063,7 @@ msgstr "" "Режим \"рідного\" MIDI потребує поновлення Roland Upgrade від\n" "LucasArts, проте %s відсутній. Перемикаюсь на AdLib." -#: engines/scumm/scumm.cpp:2295 engines/agos/saveload.cpp:220 +#: engines/scumm/scumm.cpp:2303 engines/agos/saveload.cpp:220 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2034,7 +2074,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2302 engines/agos/saveload.cpp:185 +#: engines/scumm/scumm.cpp:2310 engines/agos/saveload.cpp:185 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2045,7 +2085,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2314 engines/agos/saveload.cpp:228 +#: engines/scumm/scumm.cpp:2322 engines/agos/saveload.cpp:228 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2056,7 +2096,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2529 +#: engines/scumm/scumm.cpp:2537 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' " @@ -2067,7 +2107,7 @@ msgstr "" "виберіть папку Maniac всередені пвпки з грою Tentacle." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" msgstr "Режим швидкого переходу активовано" @@ -2088,7 +2128,7 @@ msgstr "Показати мапу" msgid "~M~ain Menu" msgstr "Головне меню" -#: engines/mohawk/dialogs.cpp:172 +#: engines/mohawk/dialogs.cpp:168 msgid "~W~ater Effect Enabled" msgstr "Ефекти води увімкнено" @@ -2110,6 +2150,15 @@ msgstr "Не вдалося зберегти стан гри у файл." msgid "Failed to delete file." msgstr "Не вдалося видалити файл." +#: engines/groovie/detection.cpp:312 +#, fuzzy +msgid "Fast movie speed" +msgstr "Швидкий режим" + +#: engines/groovie/detection.cpp:313 +msgid "Play movies at an increased speed" +msgstr "" + #: engines/groovie/script.cpp:420 msgid "Failed to save game" msgstr "Не вдалося записати гру" @@ -2467,11 +2516,11 @@ msgstr "Apple II GS Емулятор (НЕ РЕАЛІЗОВАНО)" msgid "C64 Audio Emulator" msgstr "C64 Аудіо Емулятор" -#: audio/softsynth/mt32.cpp:293 +#: audio/softsynth/mt32.cpp:205 msgid "Initializing MT-32 Emulator" msgstr "Налаштовую емулятор MT-32" -#: audio/softsynth/mt32.cpp:512 +#: audio/softsynth/mt32.cpp:431 msgid "MT-32 Emulator" msgstr "Емулятор MT-32" @@ -2653,12 +2702,12 @@ msgid "Normal (no scaling)" msgstr "Без збільшення" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 msgid "Enabled aspect ratio correction" msgstr "Корекцію співвідношення сторін увімкнено" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 msgid "Disabled aspect ratio correction" msgstr "Корекцію співвідношення сторін вимкнено" @@ -2667,7 +2716,7 @@ msgid "Active graphics filter:" msgstr "Поточний графічний фільтр:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 msgid "Windowed mode" msgstr "Віконний режим" @@ -2691,11 +2740,11 @@ msgstr "Поточний відеорежим" msgid "Current scale" msgstr "Поточний масштаб" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" msgstr "Активний режим фільтрації: Лінійний" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" msgstr "Активний режим фільтрації: Найближче" @@ -3094,6 +3143,9 @@ msgstr "Кліки увімкнено" msgid "Clicking Disabled" msgstr "Кліки вимкнено" +#~ msgid "Enable Roland GS Mode" +#~ msgstr "Увімкнути режим Roland GS" + #~ msgid "Hercules Green" #~ msgstr "Hercules Зелений" diff --git a/test/common/bufferedseekablereadstream.h b/test/common/bufferedseekablereadstream.h index 11eb58f3d0..bf21f22f77 100644 --- a/test/common/bufferedseekablereadstream.h +++ b/test/common/bufferedseekablereadstream.h @@ -72,6 +72,13 @@ class BufferedSeekableReadStreamTestSuite : public CxxTest::TestSuite { b = ssrs.readByte(); TS_ASSERT_EQUALS(b, 2); + ssrs.seek(5, SEEK_CUR); + TS_ASSERT_EQUALS(ssrs.pos(), 8); + ssrs.seek(-1, SEEK_CUR); + TS_ASSERT_EQUALS(ssrs.pos(), 7); + b = ssrs.readByte(); + TS_ASSERT_EQUALS(b, 7); + delete &ssrs; } }; |