diff options
114 files changed, 6251 insertions, 3830 deletions
@@ -35,6 +35,9 @@ For a more comprehensive changelog of the latest experimental code, see: head scene (bug #6728). It may have been happening in other scenes as well. + CinE: + - Added support for music in CD version of Future Wars. + MADE: - Improved AdLib music support in Return to Zork. diff --git a/audio/audiostream.cpp b/audio/audiostream.cpp index c413edb73d..88c41e8503 100644 --- a/audio/audiostream.cpp +++ b/audio/audiostream.cpp @@ -33,6 +33,7 @@ #include "audio/decoders/quicktime.h" #include "audio/decoders/raw.h" #include "audio/decoders/vorbis.h" +#include "audio/mixer.h" namespace Audio { @@ -465,4 +466,24 @@ AudioStream *makeLimitingAudioStream(AudioStream *parentStream, const Timestamp return new LimitingAudioStream(parentStream, length, disposeAfterUse); } +/** + * An AudioStream that plays nothing and immediately returns that + * the endOfStream() has been reached + */ +class NullAudioStream : public AudioStream { +public: + bool isStereo() const { return false; } + int getRate() const; + int readBuffer(int16 *data, const int numSamples) { return 0; } + bool endOfData() const { return true; } +}; + +int NullAudioStream::getRate() const { + return g_system->getMixer()->getOutputRate(); +} + +AudioStream *makeNullAudioStream() { + return new NullAudioStream(); +} + } // End of namespace Audio diff --git a/audio/audiostream.h b/audio/audiostream.h index 347a37b9dc..a60d5a2086 100644 --- a/audio/audiostream.h +++ b/audio/audiostream.h @@ -30,6 +30,10 @@ #include "audio/timestamp.h" +namespace Common { +class SeekableReadStream; +} + namespace Audio { /** @@ -86,7 +90,7 @@ public: * to its initial state. Note that rewinding itself is not required to * be working when the stream is being played by Mixer! */ -class RewindableAudioStream : public AudioStream { +class RewindableAudioStream : public virtual AudioStream { public: /** * Rewinds the stream to its start. @@ -153,7 +157,7 @@ AudioStream *makeLoopingAudioStream(RewindableAudioStream *stream, uint loops); * interface for seeking. The seeking itself is not required to be * working while the stream is being played by Mixer! */ -class SeekableAudioStream : public RewindableAudioStream { +class SeekableAudioStream : public virtual RewindableAudioStream { public: /** * Tries to load a file by trying all available formats. @@ -367,6 +371,74 @@ Timestamp convertTimeToStreamPos(const Timestamp &where, int rate, bool isStereo */ AudioStream *makeLimitingAudioStream(AudioStream *parentStream, const Timestamp &length, DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES); +/** + * An AudioStream designed to work in terms of packets. + * + * It is similar in concept to QueuingAudioStream, but does not + * necessarily rely on the data from each queued AudioStream + * being separate. + */ +class PacketizedAudioStream : public virtual AudioStream { +public: + virtual ~PacketizedAudioStream() {} + + /** + * Queue the next packet to be decoded. + */ + virtual void queuePacket(Common::SeekableReadStream *data) = 0; + + /** + * Mark this stream as finished. That is, signal that no further data + * will be queued to it. Only after this has been done can this + * stream ever 'end'. + */ + virtual void finish() = 0; +}; + +/** + * A PacketizedAudioStream that works closer to a QueuingAudioStream. + * It queues individual packets as whole AudioStream to an internal + * QueuingAudioStream. This is used for writing quick wrappers against + * e.g. RawStream, which can be made into PacketizedAudioStreams with + * little effort. + */ +class StatelessPacketizedAudioStream : public PacketizedAudioStream { +public: + StatelessPacketizedAudioStream(uint rate, uint channels) : + _rate(rate), _channels(channels), _stream(makeQueuingAudioStream(rate, channels == 2)) {} + virtual ~StatelessPacketizedAudioStream() {} + + // AudioStream API + bool isStereo() const { return _channels == 2; } + int getRate() const { return _rate; } + int readBuffer(int16 *data, const int numSamples) { return _stream->readBuffer(data, numSamples); } + bool endOfData() const { return _stream->endOfData(); } + bool endOfStream() const { return _stream->endOfStream(); } + + // PacketizedAudioStream API + void queuePacket(Common::SeekableReadStream *data) { _stream->queueAudioStream(makeStream(data)); } + void finish() { _stream->finish(); } + + uint getChannels() const { return _channels; } + +protected: + /** + * Make the AudioStream for a given packet + */ + virtual AudioStream *makeStream(Common::SeekableReadStream *data) = 0; + +private: + uint _rate; + uint _channels; + Common::ScopedPtr<QueuingAudioStream> _stream; +}; + +/** + * Create an AudioStream that plays nothing and immediately returns that + * endOfStream() has been reached. + */ +AudioStream *makeNullAudioStream(); + } // End of namespace Audio #endif diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp index 2f710f759d..fe5eec5dcc 100644 --- a/audio/decoders/adpcm.cpp +++ b/audio/decoders/adpcm.cpp @@ -457,4 +457,34 @@ RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, Dispo } } +class PacketizedADPCMStream : public StatelessPacketizedAudioStream { +public: + PacketizedADPCMStream(ADPCMType type, int rate, int channels, uint32 blockAlign) : + StatelessPacketizedAudioStream(rate, channels), _type(type), _blockAlign(blockAlign) {} + +protected: + AudioStream *makeStream(Common::SeekableReadStream *data); + +private: + ADPCMType _type; + uint32 _blockAlign; +}; + +AudioStream *PacketizedADPCMStream::makeStream(Common::SeekableReadStream *data) { + return makeADPCMStream(data, DisposeAfterUse::YES, data->size(), _type, getRate(), getChannels(), _blockAlign); +} + +PacketizedAudioStream *makePacketizedADPCMStream(ADPCMType type, int rate, int channels, uint32 blockAlign) { + // Filter out types we can't support (they're not fully stateless) + switch (type) { + case kADPCMOki: + case kADPCMDVI: + return 0; + default: + break; + } + + return new PacketizedADPCMStream(type, rate, channels, blockAlign); +} + } // End of namespace Audio diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h index bf6e7f759d..650bc341b3 100644 --- a/audio/decoders/adpcm.h +++ b/audio/decoders/adpcm.h @@ -44,6 +44,7 @@ class SeekableReadStream; namespace Audio { +class PacketizedAudioStream; class RewindableAudioStream; // There are several types of ADPCM encoding, only some are supported here @@ -81,6 +82,26 @@ RewindableAudioStream *makeADPCMStream( int channels, uint32 blockAlign = 0); +/** + * Creates a PacketizedAudioStream that will automatically queue + * packets as individual AudioStreams like returned by makeADPCMStream. + * + * Due to the ADPCM types not necessarily supporting stateless + * streaming, OKI and DVI are not supported by this function + * and will return NULL. + * + * @param type the compression type used + * @param rate the sampling rate + * @param channels the number of channels + * @param blockAlign block alignment ??? + * @return The new PacketizedAudioStream or NULL, if the type isn't supported. + */ +PacketizedAudioStream *makePacketizedADPCMStream( + ADPCMType type, + int rate, + int channels, + uint32 blockAlign = 0); + } // End of namespace Audio #endif diff --git a/audio/decoders/codec.h b/audio/decoders/codec.h index 93b6878dee..75910c0963 100644 --- a/audio/decoders/codec.h +++ b/audio/decoders/codec.h @@ -31,6 +31,13 @@ namespace Audio { class AudioStream; +/** + * @deprecated The old method of handling audio codecs that rely + * on the state remaining the same between calls. This should + * only be used for old code. + * + * DEPRECATED; USE PacketizedAudioStream INSTEAD! + */ class Codec { public: Codec() {} diff --git a/audio/decoders/mp3.cpp b/audio/decoders/mp3.cpp index feb531f5ae..49d4d856ab 100644 --- a/audio/decoders/mp3.cpp +++ b/audio/decoders/mp3.cpp @@ -25,8 +25,11 @@ #ifdef USE_MAD #include "common/debug.h" +#include "common/mutex.h" #include "common/ptr.h" +#include "common/queue.h" #include "common/stream.h" +#include "common/substream.h" #include "common/textconsole.h" #include "common/util.h" @@ -45,107 +48,116 @@ namespace Audio { #pragma mark - -class MP3Stream : public SeekableAudioStream { +class BaseMP3Stream : public virtual AudioStream { +public: + BaseMP3Stream(); + virtual ~BaseMP3Stream(); + + bool endOfData() const { return _state == MP3_STATE_EOS; } + bool isStereo() const { return _channels == 2; } + int getRate() const { return _rate; } + protected: + void decodeMP3Data(Common::ReadStream &stream); + void readMP3Data(Common::ReadStream &stream); + + void initStream(Common::ReadStream &stream); + void readHeader(Common::ReadStream &stream); + void deinitStream(); + + int fillBuffer(Common::ReadStream &stream, int16 *buffer, const int numSamples); + enum State { MP3_STATE_INIT, // Need to init the decoder MP3_STATE_READY, // ready for processing data MP3_STATE_EOS // end of data reached (may need to loop) }; - Common::DisposablePtr<Common::SeekableReadStream> _inStream; - uint _posInFrame; State _state; - Timestamp _length; mad_timer_t _curTime; mad_stream _stream; mad_frame _frame; mad_synth _synth; + uint _channels; + uint _rate; + enum { BUFFER_SIZE = 5 * 8192 }; // This buffer contains a slab of input data byte _buf[BUFFER_SIZE + MAD_BUFFER_GUARD]; +}; +class MP3Stream : private BaseMP3Stream, public SeekableAudioStream { public: MP3Stream(Common::SeekableReadStream *inStream, DisposeAfterUse::Flag dispose); - ~MP3Stream(); int readBuffer(int16 *buffer, const int numSamples); - - bool endOfData() const { return _state == MP3_STATE_EOS; } - bool isStereo() const { return MAD_NCHANNELS(&_frame.header) == 2; } - int getRate() const { return _frame.header.samplerate; } - bool seek(const Timestamp &where); Timestamp getLength() const { return _length; } + protected: - void decodeMP3Data(); - void readMP3Data(); + Common::ScopedPtr<Common::SeekableReadStream> _inStream; - void initStream(); - void readHeader(); - void deinitStream(); + Timestamp _length; + +private: + static Common::SeekableReadStream *skipID3(Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose); }; -MP3Stream::MP3Stream(Common::SeekableReadStream *inStream, DisposeAfterUse::Flag dispose) : - _inStream(inStream, dispose), +class PacketizedMP3Stream : private BaseMP3Stream, public PacketizedAudioStream { +public: + PacketizedMP3Stream(Common::SeekableReadStream &firstPacket); + PacketizedMP3Stream(uint channels, uint rate); + ~PacketizedMP3Stream(); + + // AudioStream API + int readBuffer(int16 *buffer, const int numSamples); + bool endOfStream() const; + + // PacketizedAudioStream API + void queuePacket(Common::SeekableReadStream *packet); + void finish(); + +private: + Common::Mutex _mutex; + Common::Queue<Common::SeekableReadStream *> _queue; + bool _finished; +}; + + +BaseMP3Stream::BaseMP3Stream() : _posInFrame(0), _state(MP3_STATE_INIT), - _length(0, 1000), _curTime(mad_timer_zero) { // The MAD_BUFFER_GUARD must always contain zeros (the reason // for this is that the Layer III Huffman decoder of libMAD // may read a few bytes beyond the end of the input buffer). memset(_buf + BUFFER_SIZE, 0, MAD_BUFFER_GUARD); - - // Calculate the length of the stream - initStream(); - - while (_state != MP3_STATE_EOS) - readHeader(); - - // To rule out any invalid sample rate to be encountered here, say in case the - // MP3 stream is invalid, we just check the MAD error code here. - // We need to assure this, since else we might trigger an assertion in Timestamp - // (When getRate() returns 0 or a negative number to be precise). - // Note that we allow "MAD_ERROR_BUFLEN" as error code here, since according - // to mad.h it is also set on EOF. - if ((_stream.error == MAD_ERROR_NONE || _stream.error == MAD_ERROR_BUFLEN) && getRate() > 0) - _length = Timestamp(mad_timer_count(_curTime, MAD_UNITS_MILLISECONDS), getRate()); - - deinitStream(); - - // Reinit stream - _state = MP3_STATE_INIT; - - // Decode the first chunk of data. This is necessary so that _frame - // is setup and isStereo() and getRate() return correct results. - decodeMP3Data(); } -MP3Stream::~MP3Stream() { +BaseMP3Stream::~BaseMP3Stream() { deinitStream(); } -void MP3Stream::decodeMP3Data() { +void BaseMP3Stream::decodeMP3Data(Common::ReadStream &stream) { do { if (_state == MP3_STATE_INIT) - initStream(); + initStream(stream); if (_state == MP3_STATE_EOS) return; // If necessary, load more data into the stream decoder if (_stream.error == MAD_ERROR_BUFLEN) - readMP3Data(); + readMP3Data(stream); while (_state == MP3_STATE_READY) { _stream.error = MAD_ERROR_NONE; @@ -179,11 +191,11 @@ void MP3Stream::decodeMP3Data() { _state = MP3_STATE_EOS; } -void MP3Stream::readMP3Data() { +void BaseMP3Stream::readMP3Data(Common::ReadStream &stream) { uint32 remaining = 0; // Give up immediately if we already used up all data in the stream - if (_inStream->eos()) { + if (stream.eos()) { _state = MP3_STATE_EOS; return; } @@ -198,7 +210,7 @@ void MP3Stream::readMP3Data() { } // Try to read the next block - uint32 size = _inStream->read(_buf + remaining, BUFFER_SIZE - remaining); + uint32 size = stream.read(_buf + remaining, BUFFER_SIZE - remaining); if (size <= 0) { _state = MP3_STATE_EOS; return; @@ -209,31 +221,7 @@ void MP3Stream::readMP3Data() { mad_stream_buffer(&_stream, _buf, size + remaining); } -bool MP3Stream::seek(const Timestamp &where) { - if (where == _length) { - _state = MP3_STATE_EOS; - return true; - } else if (where > _length) { - return false; - } - - const uint32 time = where.msecs(); - - mad_timer_t destination; - mad_timer_set(&destination, time / 1000, time % 1000, 1000); - - if (_state != MP3_STATE_READY || mad_timer_compare(destination, _curTime) < 0) - initStream(); - - while (mad_timer_compare(destination, _curTime) > 0 && _state != MP3_STATE_EOS) - readHeader(); - - decodeMP3Data(); - - return (_state != MP3_STATE_EOS); -} - -void MP3Stream::initStream() { +void BaseMP3Stream::initStream(Common::ReadStream &stream) { if (_state != MP3_STATE_INIT) deinitStream(); @@ -243,41 +231,23 @@ void MP3Stream::initStream() { mad_synth_init(&_synth); // Reset the stream data - _inStream->seek(0, SEEK_SET); _curTime = mad_timer_zero; _posInFrame = 0; - - // Skip ID3 TAG if any - // ID3v1 (beginning with with 'TAG') is located at the end of files. So we can ignore those. - // ID3v2 can be located at the start of files and begins with a 10 bytes header, the first 3 bytes being 'ID3'. - // The tag size is coded on the last 4 bytes of the 10 bytes header as a 32 bit synchsafe integer. - // See http://id3.org/id3v2.4.0-structure for details. - char data[10]; - _inStream->read(data, 10); - if (data[0] == 'I' && data[1] == 'D' && data[2] == '3') { - uint32 size = data[9] + 128 * (data[8] + 128 * (data[7] + 128 * data[6])); - // This size does not include an optional 10 bytes footer. Check if it is present. - if (data[5] & 0x10) - size += 10; - debug("Skipping ID3 TAG (%d bytes)", size + 10); - _inStream->seek(size, SEEK_CUR); - } else - _inStream->seek(0, SEEK_SET); // Update state _state = MP3_STATE_READY; // Read the first few sample bytes - readMP3Data(); + readMP3Data(stream); } -void MP3Stream::readHeader() { +void BaseMP3Stream::readHeader(Common::ReadStream &stream) { if (_state != MP3_STATE_READY) return; // If necessary, load more data into the stream decoder if (_stream.error == MAD_ERROR_BUFLEN) - readMP3Data(); + readMP3Data(stream); while (_state != MP3_STATE_EOS) { _stream.error = MAD_ERROR_NONE; @@ -287,7 +257,7 @@ void MP3Stream::readHeader() { // be far too slow). Hence we perform this explicitly in a separate step. if (mad_header_decode(&_frame.header, &_stream) == -1) { if (_stream.error == MAD_ERROR_BUFLEN) { - readMP3Data(); // Read more data + readMP3Data(stream); // Read more data continue; } else if (MAD_RECOVERABLE(_stream.error)) { debug(6, "MP3Stream: Recoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream)); @@ -307,7 +277,7 @@ void MP3Stream::readHeader() { _state = MP3_STATE_EOS; } -void MP3Stream::deinitStream() { +void BaseMP3Stream::deinitStream() { if (_state == MP3_STATE_INIT) return; @@ -319,7 +289,7 @@ void MP3Stream::deinitStream() { _state = MP3_STATE_EOS; } -static inline int scale_sample(mad_fixed_t sample) { +static inline int scaleSample(mad_fixed_t sample) { // round sample += (1L << (MAD_F_FRACBITS - 16)); @@ -333,28 +303,203 @@ static inline int scale_sample(mad_fixed_t sample) { return sample >> (MAD_F_FRACBITS + 1 - 16); } -int MP3Stream::readBuffer(int16 *buffer, const int numSamples) { +int BaseMP3Stream::fillBuffer(Common::ReadStream &stream, int16 *buffer, const int numSamples) { int samples = 0; // Keep going as long as we have input available while (samples < numSamples && _state != MP3_STATE_EOS) { const int len = MIN(numSamples, samples + (int)(_synth.pcm.length - _posInFrame) * MAD_NCHANNELS(&_frame.header)); while (samples < len) { - *buffer++ = (int16)scale_sample(_synth.pcm.samples[0][_posInFrame]); + *buffer++ = (int16)scaleSample(_synth.pcm.samples[0][_posInFrame]); samples++; if (MAD_NCHANNELS(&_frame.header) == 2) { - *buffer++ = (int16)scale_sample(_synth.pcm.samples[1][_posInFrame]); + *buffer++ = (int16)scaleSample(_synth.pcm.samples[1][_posInFrame]); samples++; } _posInFrame++; } if (_posInFrame >= _synth.pcm.length) { // We used up all PCM data in the current frame -- read & decode more - decodeMP3Data(); + decodeMP3Data(stream); } } return samples; } +MP3Stream::MP3Stream(Common::SeekableReadStream *inStream, DisposeAfterUse::Flag dispose) : + BaseMP3Stream(), + _inStream(skipID3(inStream, dispose)), + _length(0, 1000) { + + // Initialize the stream with some data + decodeMP3Data(*_inStream); + + // Calculate the length of the stream + while (_state != MP3_STATE_EOS) + readHeader(*_inStream); + + // To rule out any invalid sample rate to be encountered here, say in case the + // MP3 stream is invalid, we just check the MAD error code here. + // We need to assure this, since else we might trigger an assertion in Timestamp + // (When getRate() returns 0 or a negative number to be precise). + // Note that we allow "MAD_ERROR_BUFLEN" as error code here, since according + // to mad.h it is also set on EOF. + if ((_stream.error == MAD_ERROR_NONE || _stream.error == MAD_ERROR_BUFLEN) && getRate() > 0) + _length = Timestamp(mad_timer_count(_curTime, MAD_UNITS_MILLISECONDS), getRate()); + + deinitStream(); + + // Reinit stream + _state = MP3_STATE_INIT; + _inStream->seek(0); + + // Decode the first chunk of data. This is necessary so that _frame + // is setup and we can retrieve channels/rate. + decodeMP3Data(*_inStream); + + _channels = MAD_NCHANNELS(&_frame.header); + _rate = _frame.header.samplerate; +} + +int MP3Stream::readBuffer(int16 *buffer, const int numSamples) { + return fillBuffer(*_inStream, buffer, numSamples); +} + +bool MP3Stream::seek(const Timestamp &where) { + if (where == _length) { + _state = MP3_STATE_EOS; + return true; + } else if (where > _length) { + return false; + } + + const uint32 time = where.msecs(); + + mad_timer_t destination; + mad_timer_set(&destination, time / 1000, time % 1000, 1000); + + if (_state != MP3_STATE_READY || mad_timer_compare(destination, _curTime) < 0) { + _inStream->seek(0); + initStream(*_inStream); + } + + while (mad_timer_compare(destination, _curTime) > 0 && _state != MP3_STATE_EOS) + readHeader(*_inStream); + + decodeMP3Data(*_inStream); + + return (_state != MP3_STATE_EOS); +} + +Common::SeekableReadStream *MP3Stream::skipID3(Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose) { + // Skip ID3 TAG if any + // ID3v1 (beginning with with 'TAG') is located at the end of files. So we can ignore those. + // ID3v2 can be located at the start of files and begins with a 10 bytes header, the first 3 bytes being 'ID3'. + // The tag size is coded on the last 4 bytes of the 10 bytes header as a 32 bit synchsafe integer. + // See http://id3.org/id3v2.4.0-structure for details. + char data[10]; + stream->read(data, sizeof(data)); + + uint32 offset = 0; + if (!stream->eos() && data[0] == 'I' && data[1] == 'D' && data[2] == '3') { + uint32 size = data[9] + 128 * (data[8] + 128 * (data[7] + 128 * data[6])); + // This size does not include an optional 10 bytes footer. Check if it is present. + if (data[5] & 0x10) + size += 10; + + // Add in the 10 bytes we read in + size += sizeof(data); + debug("Skipping ID3 TAG (%d bytes)", size); + offset = size; + } + + return new Common::SeekableSubReadStream(stream, offset, stream->size(), dispose); +} + +PacketizedMP3Stream::PacketizedMP3Stream(Common::SeekableReadStream &firstPacket) : + BaseMP3Stream(), + _finished(false) { + + // Load some data to get the channels/rate + _queue.push(&firstPacket); + decodeMP3Data(firstPacket); + _channels = MAD_NCHANNELS(&_frame.header); + _rate = _frame.header.samplerate; + + // Clear everything + deinitStream(); + _state = MP3_STATE_INIT; + _queue.clear(); +} + +PacketizedMP3Stream::PacketizedMP3Stream(uint channels, uint rate) : + BaseMP3Stream(), + _finished(false) { + _channels = channels; + _rate = rate; +} + +PacketizedMP3Stream::~PacketizedMP3Stream() { + while (!_queue.empty()) { + delete _queue.front(); + _queue.pop(); + } +} + +int PacketizedMP3Stream::readBuffer(int16 *buffer, const int numSamples) { + int samples = 0; + + while (samples < numSamples) { + Common::StackLock lock(_mutex); + + // Empty? Bail out for now + if (_queue.empty()) + return samples; + + Common::SeekableReadStream *packet = _queue.front(); + + if (_state == MP3_STATE_INIT) { + // Initialize everything + decodeMP3Data(*packet); + } else if (_state == MP3_STATE_EOS) { + // Reset the end-of-stream setting + _state = MP3_STATE_READY; + } + + samples += fillBuffer(*packet, buffer + samples, numSamples - samples); + + // If the stream is done, kill it + if (packet->pos() >= packet->size()) { + _queue.pop(); + delete packet; + } + } + + return samples; +} + +bool PacketizedMP3Stream::endOfStream() const { + if (!endOfData()) + return false; + + // Lock the mutex + Common::StackLock lock(_mutex); + if (!_queue.empty()) + return false; + + return _finished; +} + +void PacketizedMP3Stream::queuePacket(Common::SeekableReadStream *packet) { + Common::StackLock lock(_mutex); + assert(!_finished); + _queue.push(packet); +} + +void PacketizedMP3Stream::finish() { + Common::StackLock lock(_mutex); + _finished = true; +} + #pragma mark - #pragma mark --- MP3 factory functions --- @@ -383,6 +528,15 @@ SeekableAudioStream *makeMP3Stream( } } +PacketizedAudioStream *makePacketizedMP3Stream(Common::SeekableReadStream &firstPacket) { + return new PacketizedMP3Stream(firstPacket); +} + +PacketizedAudioStream *makePacketizedMP3Stream(uint channels, uint rate) { + return new PacketizedMP3Stream(channels, rate); +} + + } // End of namespace Audio #endif // #ifdef USE_MAD diff --git a/audio/decoders/mp3.h b/audio/decoders/mp3.h index 609181bdba..709aad82b9 100644 --- a/audio/decoders/mp3.h +++ b/audio/decoders/mp3.h @@ -51,6 +51,7 @@ class SeekableReadStream; namespace Audio { +class PacketizedAudioStream; class SeekableAudioStream; /** @@ -65,6 +66,26 @@ SeekableAudioStream *makeMP3Stream( Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse); +/** + * Create a new PacketizedAudioStream from the first packet in the given + * stream. It does not own the packet and must be queued again later. + * + * @param firstPacket the SeekableReadStream from which to read the MP3 data + * @return a new PacketizedAudioStream + */ +PacketizedAudioStream *makePacketizedMP3Stream( + Common::SeekableReadStream &firstPacket); + +/** + * Create a new PacketizedAudioStream for a given number of channels + * and sample rate. + * + * @param firstPacket the SeekableReadStream from which to read the MP3 data + * @return a new PacketizedAudioStream + */ +PacketizedAudioStream *makePacketizedMP3Stream( + uint channels, uint rate); + } // End of namespace Audio #endif // #ifdef USE_MAD diff --git a/audio/decoders/raw.cpp b/audio/decoders/raw.cpp index 9a9f79092a..477a8e7967 100644 --- a/audio/decoders/raw.cpp +++ b/audio/decoders/raw.cpp @@ -221,4 +221,24 @@ SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size, return makeRawStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, flags, DisposeAfterUse::YES); } +class PacketizedRawStream : public StatelessPacketizedAudioStream { +public: + PacketizedRawStream(int rate, byte flags) : + StatelessPacketizedAudioStream(rate, ((flags & FLAG_STEREO) != 0) ? 2 : 1), _flags(flags) {} + +protected: + AudioStream *makeStream(Common::SeekableReadStream *data); + +private: + byte _flags; +}; + +AudioStream *PacketizedRawStream::makeStream(Common::SeekableReadStream *data) { + return makeRawStream(data, getRate(), _flags); +} + +PacketizedAudioStream *makePacketizedRawStream(int rate, byte flags) { + return new PacketizedRawStream(rate, flags); +} + } // End of namespace Audio diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h index 14e7bd45fd..7ccbcdaded 100644 --- a/audio/decoders/raw.h +++ b/audio/decoders/raw.h @@ -35,6 +35,7 @@ class SeekableReadStream; namespace Audio { +class PacketizedAudioStream; class SeekableAudioStream; /** @@ -89,6 +90,17 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream, int rate, byte flags, DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES); +/** + * Creates a PacketizedAudioStream that will automatically queue + * packets as individual AudioStreams like returned by makeRawStream. + * + * @param rate Rate of the sound data. + * @param flags Audio flags combination. + * @see RawFlags + * @return The new PacketizedAudioStream. + */ +PacketizedAudioStream *makePacketizedRawStream(int rate, byte flags); + } // End of namespace Audio #endif diff --git a/devtools/create_mortdat/create_mortdat.cpp b/devtools/create_mortdat/create_mortdat.cpp index f6b2884005..2d7c9ad3b9 100644 --- a/devtools/create_mortdat/create_mortdat.cpp +++ b/devtools/create_mortdat/create_mortdat.cpp @@ -227,6 +227,7 @@ void writeMenuData(const char *menuData, int languageId) { void writeMenuBlock() { writeMenuData(menuDataEn, 1); + writeMenuData(menuDataFr, 0); writeMenuData(menuDataDe, 2); } diff --git a/devtools/create_mortdat/menudata.h b/devtools/create_mortdat/menudata.h index 2290666ffe..0d46f93329 100644 --- a/devtools/create_mortdat/menudata.h +++ b/devtools/create_mortdat/menudata.h @@ -76,6 +76,56 @@ const char *menuDataEn = "@@@ @@@ @@@ @@@ " " "; +const char *menuDataFr = + " @@@ " + " @ " + " @ @ @@ @@@ @@@ " + " @ @ @ @ @ " + " @ @ @ @ @ " + " @ @ @ @ @ " + "@@@ @@@ @@ @@ " + " " + " @@@@@ @@ " + " @ @ @ " + " @ @ @@@ @ @@@ " + " @ @ @ @ @ @ " + " @ @ @@@@ @ @ " + " @ @ @ @@@@ " + "@@@@@ @@@ @ " + " @@@ " + " @ @ " + " @@ @ " + " @ @ @@@@ @@@@ " + " @ @ @ @ @ " + " @@@@@ @ @ " + " @ @ @ @ @ " + "@@@ @@@ @@@ @@ " + " " + " @@@@@ @@@ @@@" + " @ @ @ @ @" + " @ @@@ @ @ " + " @@@@ @ @ @ @@@ " + " @ @@@@@ @ @ " + " @ @ @ @ @ " + "@@@@@@ @@@ @@@ @@@ " + " " + " @@@@@ @ " + " @ @ " + " @ @ @@ @@@@ " + " @ @ @ @ " + " @ @ @ @@@ " + " @ @ @ @ " + "@@@@@ @@@ @@@@@ " + " " + " @@@@@@@ @ " + " @ @ " + " @ @ @@ @@@@ " + " @@@@ @ @ @ " + " @ @ @ @ " + " @ @ @ @ " + "@@@ @@@ @@@ " + " "; + const char *menuDataDe = " @@@ @@ " " @ @ " diff --git a/dists/engine-data/mort.dat b/dists/engine-data/mort.dat Binary files differindex 0d6a44206d..49d80b3922 100644 --- a/dists/engine-data/mort.dat +++ b/dists/engine-data/mort.dat diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index a4af8f2201..5fed92051c 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -92,6 +92,9 @@ Common::Error CineEngine::run() { // Initialize backend initGraphics(320, 200, false); + if (g_cine->getGameType() == GType_FW && (g_cine->getFeatures() & GF_CD)) + checkCD(); + if (getPlatform() == Common::kPlatformDOS) { g_sound = new PCSound(_mixer, this); } else { diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index 9ce683445f..e52fc464d5 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -31,6 +31,8 @@ #include "cine/bg_list.h" #include "cine/sound.h" +#include "backends/audiocd/audiocd.h" + namespace Cine { struct MouseStatusStruct { @@ -219,6 +221,8 @@ void manageEvents() { mouseData.left = mouseLeft; mouseData.right = mouseRight; + + g_system->getAudioCDManager()->updateCD(); } void getMouseData(uint16 param, uint16 *pButton, uint16 *pX, uint16 *pY) { diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index c707c60695..907086a9a1 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -543,6 +543,15 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) { loadRel(currentRelName); } + // Reset background music in CD version of Future Wars + if (getGameType() == GType_FW && (getFeatures() & GF_CD)) { + if (strlen(bgNames[0])) { + char buffer[20]; + removeExtention(buffer, bgNames[0]); + g_sound->setBgMusic(atoi(buffer + 1)); + } + } + // Load first background (Uses loadBg) if (strlen(bgNames[0])) { loadBg(bgNames[0]); diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp index c0b0c1f5da..6ad38f4433 100644 --- a/engines/cine/script_fw.cpp +++ b/engines/cine/script_fw.cpp @@ -1380,6 +1380,12 @@ int FWScript::o1_loadBg() { debugC(5, kCineDebugScript, "Line: %d: loadBg(\"%s\")", _line, param); + if (g_cine->getGameType() == GType_FW && (g_cine->getFeatures() & GF_CD)) { + char buffer[20]; + removeExtention(buffer, param); + g_sound->setBgMusic(atoi(buffer + 1)); + } + loadBg(param); g_cine->_bgIncrustList.clear(); bgVar0 = 0; diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index 0c788b816c..7cab067371 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -32,6 +32,8 @@ #include "cine/cine.h" #include "cine/sound.h" +#include "backends/audiocd/audiocd.h" + #include "audio/audiostream.h" #include "audio/fmopl.h" #include "audio/mididrv.h" @@ -907,6 +909,10 @@ void PCSoundFxPlayer::unload() { PCSound::PCSound(Audio::Mixer *mixer, CineEngine *vm) : Sound(mixer, vm), _soundDriver(0) { + _currentMusic = 0; + _currentMusicStatus = 0; + _currentBgSlot = 0; + const MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB); const MusicType musicType = MidiDriver::getMusicType(dev); if (musicType == MT_MT32 || musicType == MT_GM) { @@ -940,23 +946,98 @@ PCSound::~PCSound() { delete _soundDriver; } +static const char *const musicFileNames[11] = { + "DUGGER.DAT", + "SUITE21.DAT", + "FWARS.DAT", + "SUITE23.DAT", + "SUITE22.DAT", + "ESCAL", + "MOINES.DAT", + "MEDIAVAL.DAT", + "SFUTUR", + "ALIENS", + "TELESONG.DAT", +}; + +static uint8 musicCDTracks[11] = { + 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 22, +}; + void PCSound::loadMusic(const char *name) { debugC(5, kCineDebugSound, "PCSound::loadMusic('%s')", name); - _player->load(name); + if (_vm->getGameType() == GType_FW && (_vm->getFeatures() & GF_CD)) { + _currentMusic = 0; + _currentMusicStatus = 0; + for (int i = 0; i < 11; i++) { + if (!strcmp((const char *)name, musicFileNames[i])) { + _currentMusic = musicCDTracks[i]; + _currentMusicStatus = musicCDTracks[i]; + } + } + } else { + _player->load(name); + } } void PCSound::playMusic() { debugC(5, kCineDebugSound, "PCSound::playMusic()"); - _player->play(); + if (_vm->getGameType() == GType_FW && (_vm->getFeatures() & GF_CD)) { + g_system->getAudioCDManager()->stop(); + g_system->getAudioCDManager()->play(_currentMusic - 1, -1, 0, 0); + } else { + _player->play(); + } +} + +static uint8 bgCDTracks[49] = { + 0, 21, 21, 23, 0, 29, 0, 0, 0, 0, + 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 22, 22, 23, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +void PCSound::setBgMusic(int num) { + debugC(5, kCineDebugSound, "PCSound::setBgMusic(%d)", num); + _currentBgSlot = num; + if (!bgCDTracks[_currentBgSlot]) + return; + + if ((_currentBgSlot == 1) || (_currentMusicStatus == 0 && _currentMusic != bgCDTracks[_currentBgSlot])) { + _currentMusic = bgCDTracks[_currentBgSlot]; + g_system->getAudioCDManager()->stop(); + g_system->getAudioCDManager()->play(bgCDTracks[_currentBgSlot] - 1, -1, 0, 0); + } } void PCSound::stopMusic() { debugC(5, kCineDebugSound, "PCSound::stopMusic()"); + + if (_vm->getGameType() == GType_FW && (_vm->getFeatures() & GF_CD)) { + if (_currentBgSlot != 1) + g_system->getAudioCDManager()->stop(); + } _player->stop(); } void PCSound::fadeOutMusic() { debugC(5, kCineDebugSound, "PCSound::fadeOutMusic()"); + + if (_vm->getGameType() == GType_FW && (_vm->getFeatures() & GF_CD)) { + if (_currentMusicStatus) { + if (_currentBgSlot == 1) { + _currentMusicStatus = 0; + } else { + _currentMusic = 0; + _currentMusicStatus = 0; + g_system->getAudioCDManager()->stop(); + if (bgCDTracks[_currentBgSlot]) { + g_system->getAudioCDManager()->play(_currentBgSlot - 1, -1, 0, 0); + } + } + } + } _player->fadeOut(); } @@ -1056,6 +1137,9 @@ void PaulaSound::stopMusic() { _mixer->stopHandle(_moduleHandle); } +void PaulaSound::setBgMusic(int num) { +} + void PaulaSound::fadeOutMusic() { debugC(5, kCineDebugSound, "PaulaSound::fadeOutMusic()"); Common::StackLock lock(_musicMutex); diff --git a/engines/cine/sound.h b/engines/cine/sound.h index efb3811f9a..0149071ed7 100644 --- a/engines/cine/sound.h +++ b/engines/cine/sound.h @@ -48,6 +48,7 @@ public: virtual void playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat) = 0; virtual void stopSound(int channel) = 0; + virtual void setBgMusic(int num) = 0; protected: @@ -71,11 +72,14 @@ public: virtual void playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat); virtual void stopSound(int channel); + virtual void setBgMusic(int num); protected: PCSoundDriver *_soundDriver; PCSoundFxPlayer *_player; + + uint8 _currentMusic, _currentMusicStatus, _currentBgSlot; }; class PaulaSound : public Sound { @@ -91,6 +95,7 @@ public: virtual void playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat); virtual void stopSound(int channel); + virtual void setBgMusic(int num); enum { PAULA_FREQ = 3579545, diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp index eca6ca4c9e..b862ca96fb 100644 --- a/engines/gob/sound/cdrom.cpp +++ b/engines/gob/sound/cdrom.cpp @@ -91,7 +91,10 @@ void CDROM::startTrack(const char *trackName) { return; } - Common::strlcpy(_curTrack, trackName, 16); + Common::String curTrack(trackName); + curTrack.toUppercase(); + + Common::strlcpy(_curTrack, curTrack.c_str(), 16); stopPlaying(); _curTrackBuffer = matchPtr; diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index c00290b155..cf65e012c8 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -934,16 +934,18 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) { } // Create the audio stream - Audio::AudioStream *audStream = Audio::SeekableAudioStream::openStreamFile(info.filename); + Audio::SeekableAudioStream *seekStream = Audio::SeekableAudioStream::openStreamFile(info.filename); - if (!audStream) { + if (!seekStream) { warning("Could not play audio file '%s'", info.filename.c_str()); return false; } + Audio::AudioStream *audStream = seekStream; + // Loop if requested if (loop) - audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); + audStream = Audio::makeLoopingAudioStream(seekStream, 0); // MIDI player handles volume reset on load, IOS player doesn't - force update here updateVolume(); diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index 2a221afadc..e310bafd18 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.cpp @@ -442,7 +442,7 @@ void SimpleSound::loadHeader(Common::SeekableReadStream *in) { _blockSize = _size / _blocks; } -Audio::AudioStream *SimpleSound::makeDecoder(Common::SeekableReadStream *in, uint32 size, int32 filterId) const { +LastExpress_ADPCMStream *SimpleSound::makeDecoder(Common::SeekableReadStream *in, uint32 size, int32 filterId) const { return new LastExpress_ADPCMStream(in, DisposeAfterUse::YES, size, _blockSize, filterId); } @@ -489,7 +489,7 @@ void StreamedSound::setFilterId(int32 filterId) { if (!_as) return; - ((LastExpress_ADPCMStream *)_as)->setFilterId(filterId); + _as->setFilterId(filterId); } ////////////////////////////////////////////////////////////////////////// @@ -525,8 +525,8 @@ void AppendableSound::queueBuffer(Common::SeekableReadStream *bufferIn) { // Setup the ADPCM decoder uint32 sizeIn = (uint32)bufferIn->size(); - Audio::AudioStream *adpcm = makeDecoder(bufferIn, sizeIn); - ((LastExpress_ADPCMStream *)adpcm)->setFilterId(16); + LastExpress_ADPCMStream *adpcm = makeDecoder(bufferIn, sizeIn); + adpcm->setFilterId(16); // Queue the stream _as->queueAudioStream(adpcm); diff --git a/engines/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h index f489304ff3..19e5fda9c9 100644 --- a/engines/lastexpress/data/snd.h +++ b/engines/lastexpress/data/snd.h @@ -49,6 +49,8 @@ class SeekableReadStream; namespace LastExpress { +class LastExpress_ADPCMStream; + class SimpleSound { public: SimpleSound(); @@ -59,7 +61,7 @@ public: protected: void loadHeader(Common::SeekableReadStream *in); - Audio::AudioStream *makeDecoder(Common::SeekableReadStream *in, uint32 size, int32 filterId = -1) const; + LastExpress_ADPCMStream *makeDecoder(Common::SeekableReadStream *in, uint32 size, int32 filterId = -1) const; void play(Audio::AudioStream *as); uint32 _size; ///< data size @@ -82,7 +84,7 @@ public: void setFilterId(int32 filterId); private: - Audio::AudioStream *_as; + LastExpress_ADPCMStream *_as; bool _loaded; }; diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 6f18d7178e..198627e012 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -77,8 +77,8 @@ void Sound::initMidi() { _midiParser->setTimerRate(_midiDriver->getBaseTempo()); } -Audio::AudioStream *Sound::makeAudioStream(uint16 id, CueList *cueList) { - Audio::AudioStream *audStream = NULL; +Audio::RewindableAudioStream *Sound::makeAudioStream(uint16 id, CueList *cueList) { + Audio::RewindableAudioStream *audStream = NULL; switch (_vm->getGameType()) { case GType_MYST: @@ -109,17 +109,18 @@ Audio::AudioStream *Sound::makeAudioStream(uint16 id, CueList *cueList) { Audio::SoundHandle *Sound::playSound(uint16 id, byte volume, bool loop, CueList *cueList) { debug (0, "Playing sound %d", id); - Audio::AudioStream *audStream = makeAudioStream(id, cueList); + Audio::RewindableAudioStream *rewindStream = makeAudioStream(id, cueList); - if (audStream) { + if (rewindStream) { SndHandle *handle = getHandle(); handle->type = kUsedHandle; handle->id = id; - handle->samplesPerSecond = audStream->getRate(); + handle->samplesPerSecond = rewindStream->getRate(); // Set the stream to loop here if it's requested + Audio::AudioStream *audStream = rewindStream; if (loop) - audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); + audStream = Audio::makeLoopingAudioStream(rewindStream, 0); _vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle->handle, audStream, -1, volume); return &handle->handle; @@ -335,11 +336,12 @@ void Sound::playSLSTSound(uint16 id, bool fade, bool loop, uint16 volume, int16 sndHandle.id = id; _currentSLSTSounds.push_back(sndHandle); - Audio::AudioStream *audStream = makeMohawkWaveStream(_vm->getResource(ID_TWAV, id)); + Audio::RewindableAudioStream *rewindStream = makeMohawkWaveStream(_vm->getResource(ID_TWAV, id)); // Loop here if necessary + Audio::AudioStream *audStream = rewindStream; if (loop) - audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); + audStream = Audio::makeLoopingAudioStream(rewindStream, 0); // TODO: Handle fading, possibly just raise the volume of the channel in increments? @@ -363,7 +365,7 @@ void Sound::resumeSLST() { _vm->_mixer->pauseHandle(*_currentSLSTSounds[i].handle, false); } -Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList) { +Audio::RewindableAudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList) { uint32 tag = 0; ADPCMStatus adpcmStatus; DataChunk dataChunk; @@ -507,7 +509,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre return NULL; } -Audio::AudioStream *Sound::makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream) { +Audio::RewindableAudioStream *Sound::makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream) { uint16 header = stream->readUint16BE(); uint16 rate = 0; uint32 size = 0; @@ -646,15 +648,15 @@ Audio::SoundHandle *Sound::replaceBackgroundMyst(uint16 id, uint16 volume) { stopBackgroundMyst(); // Play new sound - Audio::AudioStream *audStream = makeAudioStream(id); + Audio::RewindableAudioStream *rewindStream = makeAudioStream(id); - if (audStream) { + if (rewindStream) { _mystBackgroundSound.type = kUsedHandle; _mystBackgroundSound.id = id; - _mystBackgroundSound.samplesPerSecond = audStream->getRate(); + _mystBackgroundSound.samplesPerSecond = rewindStream->getRate(); // Set the stream to loop - audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); + Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(rewindStream, 0); _vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mystBackgroundSound.handle, audStream, -1, volume >> 8); return &_mystBackgroundSound.handle; diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 49f6751072..75c9492d96 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -156,13 +156,13 @@ private: MidiParser *_midiParser; byte *_midiData; - static Audio::AudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList = NULL); - static Audio::AudioStream *makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream); + static Audio::RewindableAudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList = NULL); + static Audio::RewindableAudioStream *makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream); void initMidi(); Common::Array<SndHandle> _handles; SndHandle *getHandle(); - Audio::AudioStream *makeAudioStream(uint16 id, CueList *cueList = NULL); + Audio::RewindableAudioStream *makeAudioStream(uint16 id, CueList *cueList = NULL); uint16 convertMystID(uint16 id); // Myst-specific diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h index 26611d4271..fb85e749ad 100644 --- a/engines/mortevielle/detection_tables.h +++ b/engines/mortevielle/detection_tables.h @@ -124,7 +124,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = { Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0() - }, Common::FR_FRA, kUseOriginalData + }, Common::FR_FRA, kUseEngineDataFile }, { AD_TABLE_END_MARKER , Common::EN_ANY, kUseEngineDataFile} diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp index 23ca9d89b4..f02ccb69ea 100644 --- a/engines/mortevielle/sound.cpp +++ b/engines/mortevielle/sound.cpp @@ -139,22 +139,44 @@ void SoundManager::loadAmbiantSounds() { * @remarks Originally called 'charge_bruit' and 'charge_bruit5' */ void SoundManager::loadNoise() { - Common::File f1, f2; + Common::File f1, f5; - if (!f1.open("bruits")) //Translation: "noise" - error("Missing file - bruits"); - if (!f2.open("bruit5")) + if (!f5.open("bruit5")) error("Missing file - bruit5"); - _noiseBuf = (byte *)malloc(sizeof(byte) * (f1.size() + f2.size())); - assert(f1.size() > 32000); + if (f1.open("bruits")) { //Translation: "noise" + assert(f1.size() > 32000); + _noiseBuf = (byte *)malloc(sizeof(byte) * (f1.size() + f5.size())); - f1.read(_noiseBuf, 32000); // 250 * 128 - f2.read(&_noiseBuf[32000], f2.size()); - f1.read(&_noiseBuf[32000 + f2.size()], f1.size() - 32000); // 19072 + f1.read(_noiseBuf, 32000); // 250 * 128 + f5.read(&_noiseBuf[32000], f5.size()); + f1.read(&_noiseBuf[32000 + f5.size()], f1.size() - 32000); // 19072 - f1.close(); - f2.close(); + f1.close(); + } else { + Common::File f2, f3, f4; + if (!f1.open("bruit1") || !f2.open("bruit2") || !f3.open("bruit3") || !f4.open("bruit4")) + error("Missing file - bruits"); + + assert(f4.size() == 32000); + _noiseBuf = (byte *)malloc(sizeof(byte) * (f1.size() + f2.size() + f3.size() + f4.size() + f5.size())); + + f4.read(_noiseBuf, f4.size()); + int pos = f4.size(); + f5.read(&_noiseBuf[pos], f5.size()); + pos += f5.size(); + f1.read(&_noiseBuf[pos], f1.size()); + pos += f1.size(); + f2.read(&_noiseBuf[pos], f2.size()); + pos += f2.size(); + f3.read(&_noiseBuf[pos], f3.size()); + + f1.close(); + f2.close(); + f3.close(); + f4.close(); + } + f5.close(); } void SoundManager::regenbruit() { diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index 5137e1892b..cbc22e4886 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -2115,8 +2115,12 @@ void MortevielleEngine::music() { _reloadCFIEC = true; Common::File f; - if (!f.open("mort.img")) - error("Missing file - mort.img"); + if (!f.open("mort.img")) { + // Some DOS versions use MORTP2 instead of MORT.IMG + // Some have both and they are identical + if (!f.open("mortp2")) + error("Missing file - mort.img"); + } int size = f.size(); byte *compMusicBuf = (byte *)malloc(sizeof(byte) * size); diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index db260dce42..3f61946bf2 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -201,8 +201,7 @@ void IMuseDigital::saveOrLoad(Serializer *ser) { track->stream = Audio::makeQueuingAudioStream(freq, (track->mixerFlags & kFlagStereo) != 0); - _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); _mixer->pauseHandle(track->mixChanHandle, true); } } diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 34926fa34e..b7abdd074e 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -110,8 +110,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->souStreamUsed = (input != 0); if (track->souStreamUsed) { - _mixer->playStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan()); } else { strcpy(track->soundName, soundName); track->soundDesc = _sound->openSound(soundId, soundName, soundType, volGroupId, -1); @@ -167,8 +166,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); - _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); } track->used = true; @@ -368,8 +366,7 @@ Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) { // Create an appendable output buffer fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo); - _mixer->playStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan()); fadeTrack->used = true; debug(5, "cloneToFadeOutTrack() - end of func, soundId %d, fade soundId %d", track->soundId, fadeTrack->soundId); diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp index bbf7c913b7..468d61a7b2 100644 --- a/engines/sherlock/animation.cpp +++ b/engines/sherlock/animation.cpp @@ -22,6 +22,7 @@ #include "sherlock/animation.h" #include "sherlock/sherlock.h" +#include "sherlock/scalpel/scalpel_screen.h" #include "common/algorithm.h" namespace Sherlock { @@ -212,7 +213,7 @@ bool Animation::play3DO(const Common::String &filename, bool intro, int minDelay if (fadeActive) { // process fading - screen.blitFrom3DOcolorLimit(fadeLimitColor); + static_cast<Scalpel::Scalpel3DOScreen *>(_vm->_screen)->blitFrom3DOcolorLimit(fadeLimitColor); if (!fadeLimitColor) { // we are at the end, so stop diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp index 2813a7eb69..39f8da3806 100644 --- a/engines/sherlock/debugger.cpp +++ b/engines/sherlock/debugger.cpp @@ -23,12 +23,13 @@ #include "sherlock/debugger.h" #include "sherlock/sherlock.h" #include "sherlock/music.h" -#include "sherlock/scalpel/3do/movie_decoder.h" +#include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_debugger.h" #include "sherlock/tattoo/tattoo_debugger.h" #include "audio/mixer.h" #include "audio/decoders/aiff.h" #include "audio/decoders/wave.h" +#include "common/str-array.h" namespace Sherlock { @@ -45,13 +46,15 @@ Debugger::Debugger(SherlockEngine *vm) : GUI::Debugger(), _vm(vm) { registerCmd("continue", WRAP_METHOD(Debugger, cmdExit)); registerCmd("scene", WRAP_METHOD(Debugger, cmdScene)); registerCmd("song", WRAP_METHOD(Debugger, cmdSong)); + registerCmd("songs", WRAP_METHOD(Debugger, cmdListSongs)); + registerCmd("listfiles", WRAP_METHOD(Debugger, cmdListFiles)); registerCmd("dumpfile", WRAP_METHOD(Debugger, cmdDumpFile)); - registerCmd("locations", WRAP_METHOD(Debugger, cmdLocations)); + registerCmd("locations", WRAP_METHOD(Debugger, cmdLocations)); } void Debugger::postEnter() { if (!_3doPlayMovieFile.empty()) { - Scalpel3DOMoviePlay(_3doPlayMovieFile.c_str(), Common::Point(0, 0)); + static_cast<Scalpel::ScalpelEngine *>(_vm)->play3doMovie(_3doPlayMovieFile, Common::Point(0, 0)); _3doPlayMovieFile.clear(); } @@ -87,15 +90,40 @@ bool Debugger::cmdScene(int argc, const char **argv) { bool Debugger::cmdSong(int argc, const char **argv) { if (argc != 2) { - debugPrintf("Format: song <room>\n"); + debugPrintf("Format: song <name>\n"); return true; } - if (!_vm->_music->loadSong(strToInt(argv[1]))) { - debugPrintf("Invalid song number.\n"); + Common::StringArray songs; + _vm->_music->getSongNames(songs); + + for (uint i = 0; i < songs.size(); i++) { + if (songs[i].equalsIgnoreCase(argv[1])) { + _vm->_music->loadSong(songs[i]); + return false; + } + } + + debugPrintf("Invalid song. Use the 'songs' command to see which ones are available.\n"); + return true; +} + +bool Debugger::cmdListSongs(int argc, const char **argv) { + Common::StringArray songs; + _vm->_music->getSongNames(songs); + debugPrintColumns(songs); + return true; +} + +bool Debugger::cmdListFiles(int argc, const char **argv) { + if (argc != 2) { + debugPrintf("Format: listfiles <resource file>\n"); return true; } - return false; + Common::StringArray files; + _vm->_res->getResourceNames(Common::String(argv[1]), files); + debugPrintColumns(files); + return true; } bool Debugger::cmdDumpFile(int argc, const char **argv) { diff --git a/engines/sherlock/debugger.h b/engines/sherlock/debugger.h index abc8ef012d..bcc4448c32 100644 --- a/engines/sherlock/debugger.h +++ b/engines/sherlock/debugger.h @@ -50,6 +50,16 @@ private: bool cmdSong(int argc, const char **argv); /** + * Lists all available songs + */ + bool cmdListSongs(int argc, const char **argv); + + /** + * Lists all files in a library (use at your own risk) + */ + bool cmdListFiles(int argc, const char **argv); + + /** * Dumps a file to disk */ bool cmdDumpFile(int argc, const char **argv); diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h index e2b5a3dce9..b962335a70 100644 --- a/engines/sherlock/detection_tables.h +++ b/engines/sherlock/detection_tables.h @@ -32,7 +32,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_ENTRY1s("talk.lib", "ad0c4d6865edf15da4e9204c08815875", 238928), Common::EN_ANY, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE, GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE) }, @@ -50,7 +50,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_LISTEND}, Common::DE_DEU, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE, GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE) }, @@ -68,7 +68,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_LISTEND}, Common::DE_DEU, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE, GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE) }, @@ -86,7 +86,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_LISTEND}, Common::ES_ESP, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE, GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE) }, @@ -102,8 +102,7 @@ static const SherlockGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatform3DO, ADGF_UNSTABLE, - GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE, - GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE) + GUIO4(GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE,GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE) }, GType_SerratedScalpel, }, @@ -117,7 +116,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_ENTRY1s("talk.lib", "dbdc8a20c96900aa7e4d02f3fe8a274c", 121102), Common::EN_ANY, Common::kPlatformDOS, - ADGF_UNSTABLE | ADGF_DEMO, + ADGF_TESTING | ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, GType_SerratedScalpel, @@ -132,7 +131,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_ENTRY1s("music.lib", "ec19a09b7fef6fd90b1ab812ce6e9739", 38563), Common::EN_ANY, Common::kPlatformDOS, - ADGF_UNSTABLE | ADGF_DEMO, + ADGF_TESTING | ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, GType_SerratedScalpel, @@ -147,7 +146,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_ENTRY1s("talk.lib", "22e8e6406dd2fbbb238c9898928df42e", 770756), Common::EN_ANY, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO3(GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_HELP_STYLE, GAMEOPTION_TRANSPARENT_WINDOWS) }, GType_RoseTattoo @@ -162,7 +161,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_ENTRY1s("talk.lib", "9639a756b0993ebd71cb5f4d8b78b2dc", 765134), Common::EN_ANY, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO3(GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_HELP_STYLE, GAMEOPTION_TRANSPARENT_WINDOWS) }, GType_RoseTattoo, @@ -177,7 +176,7 @@ static const SherlockGameDescription gameDescriptions[] = { AD_ENTRY1s("talk.lib", "5027aa72f0d263ed3b1c764a6c397911", 873864), Common::DE_DEU, Common::kPlatformDOS, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO3(GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_HELP_STYLE, GAMEOPTION_TRANSPARENT_WINDOWS) }, GType_RoseTattoo, diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp index 758ba12b6a..697c1420a6 100644 --- a/engines/sherlock/events.cpp +++ b/engines/sherlock/events.cpp @@ -43,6 +43,8 @@ Events::Events(SherlockEngine *vm): _vm(vm) { _rightPressed = _rightReleased = false; _oldButtons = _oldRightButton = false; _firstPress = false; + _waitCounter = 0; + _frameRate = GAME_FRAME_RATE; if (_vm->_interactiveFl) loadCursors("rmouse.vgs"); @@ -67,7 +69,7 @@ void Events::loadCursors(const Common::String &filename) { } void Events::setCursor(CursorId cursorId) { - if (cursorId == _cursorId) + if (cursorId == _cursorId || _waitCounter > 0) return; int hotspotX, hotspotY; @@ -95,9 +97,27 @@ void Events::setCursor(const Graphics::Surface &src, int hotspotX, int hotspotY) if (!IS_3DO) { // PC 8-bit palettized CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0xff); + } else if (!_vm->_isScreenDoubled) { + CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0x0000, false, &src.format); } else { + Graphics::Surface tempSurface; + tempSurface.create(2 * src.w, 2 * src.h, src.format); + + for (int y = 0; y < src.h; y++) { + const uint16 *srcP = (const uint16 *)src.getBasePtr(0, y); + uint16 *destP = (uint16 *)tempSurface.getBasePtr(0, 2 * y); + for (int x = 0; x < src.w; ++x, ++srcP, destP += 2) { + *destP = *srcP; + *(destP + 1) = *srcP; + *(destP + 2 * src.w) = *srcP; + *(destP + 2 * src.w + 1) = *srcP; + } + } + // 3DO RGB565 - CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0x0000, false, &src.format); + CursorMan.replaceCursor(tempSurface.getPixels(), tempSurface.w, tempSurface.h, 2 * hotspotX, 2 * hotspotY, 0x0000, false, &src.format); + + tempSurface.free(); } showCursor(); } @@ -174,6 +194,8 @@ void Events::pollEvents() { Common::Event event; while (g_system->getEventManager()->pollEvent(event)) { _mousePos = event.mouse; + if (_vm->_isScreenDoubled) + _mousePos = Common::Point(_mousePos.x / 2, _mousePos.y / 2); // Handle events switch (event.type) { @@ -217,7 +239,11 @@ void Events::pollEventsAndWait() { } void Events::warpMouse(const Common::Point &pt) { - _mousePos = pt - _vm->_screen->_currentScroll; + Common::Point pos = pt; + if (_vm->_isScreenDoubled) + pos = Common::Point(pt.x / 2, pt.y); + + _mousePos = pos - _vm->_screen->_currentScroll; g_system->warpMouse(_mousePos.x, _mousePos.y); } @@ -231,10 +257,14 @@ Common::Point Events::mousePos() const { return _vm->_screen->_currentScroll + _mousePos; } +void Events::setFrameRate(int newRate) { + _frameRate = newRate; +} + bool Events::checkForNextFrameCounter() { // Check for next game frame uint32 milli = g_system->getMillis(); - if ((milli - _priorFrameTime) >= GAME_FRAME_TIME) { + if ((milli - _priorFrameTime) >= (1000 / _frameRate)) { ++_frameCounter; _priorFrameTime = milli; @@ -302,7 +332,7 @@ void Events::clearKeyboard() { } void Events::wait(int numFrames) { - uint32 totalMilli = numFrames * 1000 / GAME_FRAME_RATE; + uint32 totalMilli = numFrames * 1000 / _frameRate; delay(totalMilli); } @@ -361,4 +391,14 @@ bool Events::checkInput() { return kbHit() || _pressed || _released || _rightPressed || _rightReleased; } +void Events::incWaitCounter() { + setCursor(WAIT); + ++_waitCounter; +} + +void Events::decWaitCounter() { + assert(_waitCounter > 0); + --_waitCounter; +} + } // End of namespace Sherlock diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h index 59d145bada..e13ef18822 100644 --- a/engines/sherlock/events.h +++ b/engines/sherlock/events.h @@ -45,6 +45,8 @@ private: ImageFile *_cursorImages; int _mouseButtons; Common::Point _mousePos; + int _waitCounter; + uint _frameRate; /** * Check whether it's time to display the next screen frame @@ -142,6 +144,11 @@ public: Common::Point mousePos() const; /** + * Override the default frame rate + */ + void setFrameRate(int newRate); + + /** * Return the current game frame number */ uint32 getFrameCounter() const { return _frameCounter; } @@ -188,6 +195,16 @@ public: * Checks to see to see if a key or a mouse button is pressed. */ bool checkInput(); + + /** + * Increment the wait counter + */ + void incWaitCounter(); + + /** + * Decrement the wait counter + */ + void decWaitCounter(); }; } // End of namespace Sherlock diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp index 334cc05abf..e442a3c903 100644 --- a/engines/sherlock/journal.cpp +++ b/engines/sherlock/journal.cpp @@ -250,7 +250,7 @@ bool Journal::drawJournal(int direction, int howFar) { // Print out the found keyword Common::String lineMatch(matchP, matchP + _find.size()); - byte fgColor = IS_SERRATED_SCALPEL ? (byte)Scalpel::INV_FOREGROUND : (byte)Tattoo::INV_FOREGROUND; + byte fgColor = IS_SERRATED_SCALPEL ? (byte)Scalpel::INV_FOREGROUND : (byte)Tattoo::PEN_HIGHLIGHT_COLOR; screen.gPrint(Common::Point(JOURNAL_LEFT_X + width, yp), fgColor, "%s", lineMatch.c_str()); width += screen.stringWidth(lineMatch.c_str()); diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index 99f7b45617..7802bf5eeb 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -20,6 +20,7 @@ * */ +#include "common/algorithm.h" #include "common/config-manager.h" #include "common/mutex.h" #include "sherlock/sherlock.h" @@ -579,4 +580,37 @@ void Music::setMusicVolume(int volume) { _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume); } +void Music::getSongNames(Common::StringArray &songs) { + songs.clear(); + if (IS_SERRATED_SCALPEL) { + if (IS_3DO) { + Common::FSDirectory gameDirectory(ConfMan.get("path")); + Common::FSDirectory *musicDirectory = gameDirectory.getSubDirectory("music"); + Common::ArchiveMemberList files; + + musicDirectory->listMatchingMembers(files, "*_mw22.aifc"); + + for (Common::ArchiveMemberList::iterator i = files.begin(); i != files.end(); ++i) { + Common::String name = (*i)->getName(); + name.erase(name.size() - 10); + songs.push_back(name); + } + } else { + for (int i = 0; i < ARRAYSIZE(SONG_NAMES); i++) { + songs.push_back(SONG_NAMES[i]); + } + } + } else { + Common::StringArray fileList; + _vm->_res->getResourceNames("music.lib", fileList); + for (Common::StringArray::iterator i = fileList.begin(); i != fileList.end(); ++i) { + if ((*i).matchString("*.XMI", true)) { + (*i).erase((*i).size() - 4); + songs.push_back(*i); + } + } + } + Common::sort(songs.begin(), songs.end()); +} + } // End of namespace Sherlock diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h index ca203da019..afd3a429be 100644 --- a/engines/sherlock/music.h +++ b/engines/sherlock/music.h @@ -31,6 +31,7 @@ #include "audio/audiostream.h" #include "audio/mixer.h" #include "common/mutex.h" +#include "common/str-array.h" namespace Sherlock { @@ -121,9 +122,13 @@ public: * Sets the volume of the MIDI music with a value ranging from 0 to 127 */ void setMusicVolume(int volume); + + /** + * Gets the names of all the songs in the game. Used by the debugger. + */ + void getSongNames(Common::StringArray &songs); }; } // End of namespace Sherlock #endif - diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 533d2bcc67..093f666a46 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -90,7 +90,7 @@ BaseObject::BaseObject() { bool BaseObject::hasAborts() const { int seqNum = _talkSeq; - // See if the object is in it's regular sequence + // See if the object is in its regular sequence bool startChecking = !seqNum || _type == CHARACTER; uint idx = 0; @@ -350,10 +350,10 @@ bool BaseObject::checkEndOfSequence() { if (_type == REMOVE || _type == INVALID) return false; - if (_sequences[_frameNumber] == 0 || _frameNumber >= checkFrame) { + if (_frameNumber < 0 || _frameNumber >= checkFrame || _sequences[_frameNumber] == 0) { result = true; - if (_frameNumber >= (checkFrame - 1)) { + if (_frameNumber < 0 || _frameNumber >= (checkFrame - 1)) { _frameNumber = START_FRAME; } else { // Determine next sequence to use @@ -445,7 +445,7 @@ void BaseObject::setObjSequence(int seq, bool wait) { // Use the saved start of the sequence to reset the frame _frameNumber = _startSeq; } else { - // For Scalpel, scan backwards from the end of the sequence to find it's start + // For Scalpel, scan backwards from the end of the sequence to find its start do { --_frameNumber; } while (_frameNumber > 0 && _sequences[_frameNumber] != 0); diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp index 4cdf688676..c4093048bd 100644 --- a/engines/sherlock/resources.cpp +++ b/engines/sherlock/resources.cpp @@ -64,7 +64,7 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream) // Check whether the file is compressed if (signature == MKTAG('L', 'Z', 'V', 26)) { - // It's compressed, so decompress the file and store it's data in the cache entry + // It's compressed, so decompress the file and store its data in the cache entry Common::SeekableReadStream *decompressed = _vm->_res->decompress(stream); cacheEntry.resize(decompressed->size()); decompressed->read(&cacheEntry[0], decompressed->size()); @@ -200,7 +200,7 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename, cons // Open up the library for access Common::SeekableReadStream *libStream = load(libraryFile); - // Check if the library has already had it's index read, and if not, load it + // Check if the library has already had its index read, and if not, load it if (!_indexes.contains(libraryFile)) loadLibraryIndex(libraryFile, libStream, false); LibraryIndex &libIndex = _indexes[libraryFile]; @@ -314,6 +314,14 @@ int Resources::resourceIndex() const { return _resourceIndex; } +void Resources::getResourceNames(const Common::String &libraryFile, Common::StringArray &names) { + addToCache(libraryFile); + LibraryIndex &libIndex = _indexes[libraryFile]; + for (LibraryIndex::iterator i = libIndex.begin(); i != libIndex.end(); ++i) { + names.push_back(i->_key); + } +} + Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &source) { // This variation can't be used by Rose Tattoo, since compressed resources include the input size, // not the output size. Which means their decompression has to be done via passed buffers diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h index cb8816c2ec..99d58a51b1 100644 --- a/engines/sherlock/resources.h +++ b/engines/sherlock/resources.h @@ -29,6 +29,7 @@ #include "common/hash-str.h" #include "common/rect.h" #include "common/str.h" +#include "common/str-array.h" #include "common/stream.h" #include "graphics/surface.h" @@ -88,7 +89,7 @@ private: int _resourceIndex; /** - * Reads in the index from a library file, and caches it's index for later use + * Reads in the index from a library file, and caches its index for later use */ void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream, bool isNewStyle); public: @@ -96,7 +97,7 @@ public: /** * Adds the specified file to the cache. If it's a library file, takes care of - * loading it's index for future use + * loading its index for future use */ void addToCache(const Common::String &filename); @@ -113,7 +114,7 @@ public: bool isInCache(const Common::String &filename) const { return _cache.isCached(filename); } /** - * Checks the passed stream, and if is compressed, deletes it and replaces it with it's uncompressed data + * Checks the passed stream, and if is compressed, deletes it and replaces it with its uncompressed data */ void decompressIfNecessary(Common::SeekableReadStream *&stream); @@ -133,13 +134,18 @@ public: bool exists(const Common::String &filename) const; /** - * Returns the index of the last loaded resource in it's given library file. + * Returns the index of the last loaded resource in its given library file. * This will be used primarily when loading talk files, so the engine can * update the given conversation number in the journal */ int resourceIndex() const; /** + * Produces a list of all resource names within a file. Used by the debugger. + */ + void getResourceNames(const Common::String &libraryFile, Common::StringArray &names); + + /** * Decompresses LZW compressed data */ Common::SeekableReadStream *decompress(Common::SeekableReadStream &source); diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp index 8e8f99bc19..da4d08ca47 100644 --- a/engines/sherlock/scalpel/3do/movie_decoder.cpp +++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp @@ -464,47 +464,4 @@ Audio::AudioStream *Scalpel3DOMovieDecoder::StreamAudioTrack::getAudioStream() c return _audioStream; } -// Test-code - -// Code for showing a movie. Only meant for testing/debug purposes -bool Scalpel3DOMoviePlay(const char *filename, Common::Point pos) { - Scalpel3DOMovieDecoder *videoDecoder = new Scalpel3DOMovieDecoder(); - - if (!videoDecoder->loadFile(filename)) { - warning("Scalpel3DOMoviePlay: could not open '%s'", filename); - return false; - } - - bool skipVideo = false; - //byte bytesPerPixel = videoDecoder->getPixelFormat().bytesPerPixel; - uint16 width = videoDecoder->getWidth(); - uint16 height = videoDecoder->getHeight(); - //uint16 pitch = videoDecoder->getWidth() * bytesPerPixel; - - videoDecoder->start(); - - while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && (!skipVideo)) { - if (videoDecoder->needsUpdate()) { - const Graphics::Surface *frame = videoDecoder->decodeNextFrame(); - - if (frame) { - g_system->copyRectToScreen(frame->getPixels(), frame->pitch, pos.x, pos.y, width, height); - g_system->updateScreen(); - } - } - - Common::Event event; - while (g_system->getEventManager()->pollEvent(event)) { - if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE)) - skipVideo = true; - } - - g_system->delayMillis(10); - } - videoDecoder->close(); - delete videoDecoder; - - return !skipVideo; -} - } // End of namespace Sherlock diff --git a/engines/sherlock/scalpel/3do/movie_decoder.h b/engines/sherlock/scalpel/3do/movie_decoder.h index 9f1670fc6c..73b125443b 100644 --- a/engines/sherlock/scalpel/3do/movie_decoder.h +++ b/engines/sherlock/scalpel/3do/movie_decoder.h @@ -119,9 +119,6 @@ private: StreamAudioTrack *_audioTrack; }; -// Testing -extern bool Scalpel3DOMoviePlay(const char *filename, Common::Point pos); - } // End of namespace Sherlock #endif diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index fc8b1e609a..a76b73e109 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -21,16 +21,18 @@ */ #include "engines/util.h" +#include "gui/saveload.h" +#include "common/translation.h" #include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_fixed_text.h" #include "sherlock/scalpel/scalpel_map.h" #include "sherlock/scalpel/scalpel_people.h" #include "sherlock/scalpel/scalpel_scene.h" +#include "sherlock/scalpel/scalpel_screen.h" #include "sherlock/scalpel/tsage/logo.h" #include "sherlock/sherlock.h" #include "sherlock/music.h" #include "sherlock/animation.h" -// for 3DO #include "sherlock/scalpel/3do/movie_decoder.h" namespace Sherlock { @@ -174,29 +176,103 @@ const PeopleData PEOPLE_DATA[MAX_PEOPLE] = { { "INSP", "Inspector Lestrade", { 4, 0, 0 }, { 2, 0, 0 } } }; +uint INFO_BLACK; +uint BORDER_COLOR; +uint COMMAND_BACKGROUND; +uint BUTTON_BACKGROUND; +uint TALK_FOREGROUND; +uint TALK_NULL; +uint BUTTON_TOP; +uint BUTTON_MIDDLE; +uint BUTTON_BOTTOM; +uint COMMAND_FOREGROUND; +uint COMMAND_HIGHLIGHTED; +uint COMMAND_NULL; +uint INFO_FOREGROUND; +uint INFO_BACKGROUND; +uint INV_FOREGROUND; +uint INV_BACKGROUND; +uint PEN_COLOR; + /*----------------------------------------------------------------*/ +#define FROM_RGB(r, g, b) pixelFormatRGB565.RGBToColor(r, g, b) + ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) : SherlockEngine(syst, gameDesc) { _darts = nullptr; _mapResult = 0; + + if (getPlatform() == Common::kPlatform3DO) { + const Graphics::PixelFormat pixelFormatRGB565 = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); + INFO_BLACK = FROM_RGB(0, 0, 0); + BORDER_COLOR = FROM_RGB(0x6d, 0x38, 0x10); + COMMAND_BACKGROUND = FROM_RGB(0x38, 0x38, 0xce); + BUTTON_BACKGROUND = FROM_RGB(0x95, 0x5d, 0x24); + TALK_FOREGROUND = FROM_RGB(0xff, 0x55, 0x55); + TALK_NULL = FROM_RGB(0xce, 0xc6, 0xc2); + BUTTON_TOP = FROM_RGB(0xbe, 0x85, 0x3c); + BUTTON_MIDDLE = FROM_RGB(0x9d, 0x40, 0); + BUTTON_BOTTOM = FROM_RGB(0x69, 0x24, 0); + COMMAND_FOREGROUND = FROM_RGB(0xFF, 0xFF, 0xFF); + COMMAND_HIGHLIGHTED = FROM_RGB(0x55, 0xff, 0x55); + COMMAND_NULL = FROM_RGB(0x69, 0x24, 0); + INFO_FOREGROUND = FROM_RGB(0x55, 0xff, 0xff); + INFO_BACKGROUND = FROM_RGB(0, 0, 0x48); + INV_FOREGROUND = FROM_RGB(0xff, 0xff, 0x55); + INV_BACKGROUND = FROM_RGB(0, 0, 0x48); + PEN_COLOR = FROM_RGB(0x50, 0x18, 0); + } else { + INFO_BLACK = 1; + BORDER_COLOR = 237; + COMMAND_BACKGROUND = 4; + BUTTON_BACKGROUND = 235; + TALK_FOREGROUND = 12; + TALK_NULL = 16; + BUTTON_TOP = 233; + BUTTON_MIDDLE = 244; + BUTTON_BOTTOM = 248; + COMMAND_FOREGROUND = 15; + COMMAND_HIGHLIGHTED = 10; + COMMAND_NULL = 248; + INFO_FOREGROUND = 11; + INFO_BACKGROUND = 1; + INV_FOREGROUND = 14; + INV_BACKGROUND = 1; + PEN_COLOR = 250; + } } ScalpelEngine::~ScalpelEngine() { delete _darts; } -void ScalpelEngine::initialize() { - // 3DO actually uses RGB555, but some platforms of ours only support RGB565, so we use that - - if (getPlatform() == Common::kPlatform3DO) { - const Graphics::PixelFormat pixelFormatRGB565 = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); - // 320x200 16-bit RGB565 for 3DO support - initGraphics(320, 200, false, &pixelFormatRGB565); - } else { +void ScalpelEngine::setupGraphics() { + if (getPlatform() != Common::kPlatform3DO) { // 320x200 palettized initGraphics(320, 200, false); + } else { + // 3DO actually uses RGB555, but some platforms of ours only support RGB565, so we use that + const Graphics::PixelFormat pixelFormatRGB565 = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); + + // First try for a 640x400 mode + g_system->beginGFXTransaction(); + initCommonGFX(true); + g_system->initSize(640, 400, &pixelFormatRGB565); + OSystem::TransactionError gfxError = g_system->endGFXTransaction(); + + if (gfxError == OSystem::kTransactionSuccess) { + _isScreenDoubled = true; + } else { + // System doesn't support it, so fall back on 320x200 mode + initGraphics(320, 200, false, &pixelFormatRGB565); + } } +} + +void ScalpelEngine::initialize() { + // Setup graphics mode + setupGraphics(); // Let the base engine intialize SherlockEngine::initialize(); @@ -242,6 +318,8 @@ void ScalpelEngine::showOpening() { if (isDemo() && _interactiveFl) return; + _events->setFrameRate(60); + if (getPlatform() == Common::kPlatform3DO) { show3DOSplash(); @@ -255,20 +333,22 @@ void ScalpelEngine::showOpening() { _events->clearEvents(); _music->stopMusic(); - return; - } + } else { + TsAGE::Logo::show(this); - TsAGE::Logo::show(this); - finished = showCityCutscene(); - if (finished) - finished = showAlleyCutscene(); - if (finished) - finished = showStreetCutscene(); - if (finished) - showOfficeCutscene(); + finished = showCityCutscene(); + if (finished) + finished = showAlleyCutscene(); + if (finished) + finished = showStreetCutscene(); + if (finished) + showOfficeCutscene(); - _events->clearEvents(); - _music->stopMusic(); + _events->clearEvents(); + _music->stopMusic(); + } + + _events->setFrameRate(GAME_FRAME_RATE); } bool ScalpelEngine::showCityCutscene() { @@ -595,7 +675,7 @@ bool ScalpelEngine::show3DOSplash() { if (finished) { // EA logo movie - Scalpel3DOMoviePlay("EAlogo.stream", Common::Point(20, 0)); + play3doMovie("EAlogo.stream", Common::Point(20, 0)); } // Always clear screen @@ -604,9 +684,10 @@ bool ScalpelEngine::show3DOSplash() { } bool ScalpelEngine::showCityCutscene3DO() { + Scalpel3DOScreen &screen = *(Scalpel3DOScreen *)_screen; _animation->_soundLibraryFilename = "TITLE.SND"; - _screen->clear(); + screen.clear(); bool finished = _events->delay(2500, true); // rain.aiff seems to be playing in an endless loop until @@ -619,8 +700,8 @@ bool ScalpelEngine::showCityCutscene3DO() { _music->loadSong("prolog"); // Fade screen to grey - _screen->_backBuffer1.fill(0xCE59); // RGB565: 25, 50, 25 (grey) - _screen->fadeIntoScreen3DO(2); + screen._backBuffer1.fill(0xCE59); // RGB565: 25, 50, 25 (grey) + screen.fadeIntoScreen3DO(2); } if (finished) { @@ -628,27 +709,27 @@ bool ScalpelEngine::showCityCutscene3DO() { } if (finished) { - _screen->_backBuffer1.fill(0); // fill backbuffer with black to avoid issues during fade from white + screen._backBuffer1.fill(0); // fill backbuffer with black to avoid issues during fade from white finished = _animation->play3DO("26open1", true, 1, true, 2); } if (finished) { - _screen->_backBuffer1.blitFrom(*_screen); // save into backbuffer 1, used for fade - _screen->_backBuffer2.blitFrom(*_screen); // save into backbuffer 2, for restoring later + screen._backBuffer1.blitFrom(*_screen); // save into backbuffer 1, used for fade + screen._backBuffer2.blitFrom(*_screen); // save into backbuffer 2, for restoring later // "London, England" ImageFile3DO titleImage_London("title2a.cel", kImageFile3DOType_Cel); - _screen->_backBuffer1.transBlitFrom(titleImage_London[0]._frame, Common::Point(30, 50)); + screen._backBuffer1.transBlitFrom(titleImage_London[0]._frame, Common::Point(30, 50)); - _screen->fadeIntoScreen3DO(1); + screen.fadeIntoScreen3DO(1); finished = _events->delay(1500, true); if (finished) { // "November, 1888" ImageFile3DO titleImage_November("title2b.cel", kImageFile3DOType_Cel); - _screen->_backBuffer1.transBlitFrom(titleImage_November[0]._frame, Common::Point(100, 100)); + screen._backBuffer1.transBlitFrom(titleImage_November[0]._frame, Common::Point(100, 100)); - _screen->fadeIntoScreen3DO(1); + screen.fadeIntoScreen3DO(1); finished = _music->waitUntilMSec(14700, 0, 0, 5000); } @@ -662,21 +743,21 @@ bool ScalpelEngine::showCityCutscene3DO() { finished = _animation->play3DO("26open2", true, 1, false, 2); if (finished) { - _screen->_backBuffer1.blitFrom(*_screen); // save into backbuffer 1, used for fade + screen._backBuffer1.blitFrom(screen); // save into backbuffer 1, used for fade // "Sherlock Holmes" (title) ImageFile3DO titleImage_SherlockHolmesTitle("title1ab.cel", kImageFile3DOType_Cel); - _screen->_backBuffer1.transBlitFrom(titleImage_SherlockHolmesTitle[0]._frame, Common::Point(34, 5)); + screen._backBuffer1.transBlitFrom(titleImage_SherlockHolmesTitle[0]._frame, Common::Point(34, 5)); // Blend in - _screen->fadeIntoScreen3DO(2); + screen.fadeIntoScreen3DO(2); finished = _events->delay(500, true); // Title should fade in, Copyright should be displayed a bit after that if (finished) { ImageFile3DO titleImage_Copyright("title1c.cel", kImageFile3DOType_Cel); - _screen->transBlitFrom(titleImage_Copyright[0]._frame, Common::Point(20, 190)); + screen.transBlitFrom(titleImage_Copyright[0]._frame, Common::Point(20, 190)); finished = _events->delay(3500, true); } } @@ -686,27 +767,28 @@ bool ScalpelEngine::showCityCutscene3DO() { if (finished) { // Fade to black - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(3); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(3); } if (finished) { // "In the alley behind the Regency Theatre..." ImageFile3DO titleImage_InTheAlley("title1d.cel", kImageFile3DOType_Cel); - _screen->_backBuffer1.transBlitFrom(titleImage_InTheAlley[0]._frame, Common::Point(72, 51)); + screen._backBuffer1.transBlitFrom(titleImage_InTheAlley[0]._frame, Common::Point(72, 51)); // Fade in - _screen->fadeIntoScreen3DO(4); + screen.fadeIntoScreen3DO(4); finished = _music->waitUntilMSec(39900, 0, 0, 2500); // Fade out - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(4); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(4); } return finished; } bool ScalpelEngine::showAlleyCutscene3DO() { + Scalpel3DOScreen &screen = *(Scalpel3DOScreen *)_screen; bool finished = _music->waitUntilMSec(43500, 0, 0, 1000); if (finished) @@ -714,8 +796,8 @@ bool ScalpelEngine::showAlleyCutscene3DO() { if (finished) { // Fade out... - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(3); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(3); finished = _music->waitUntilMSec(67100, 0, 0, 1000); // 66700 } @@ -730,8 +812,8 @@ bool ScalpelEngine::showAlleyCutscene3DO() { // Show screaming victim ImageFile3DO titleImage_ScreamingVictim("scream.cel", kImageFile3DOType_Cel); - _screen->clear(); - _screen->transBlitFrom(titleImage_ScreamingVictim[0]._frame, Common::Point(0, 0)); + screen.clear(); + screen.transBlitFrom(titleImage_ScreamingVictim[0]._frame, Common::Point(0, 0)); // Play "scream.aiff" if (_sound->_voices) @@ -742,8 +824,8 @@ bool ScalpelEngine::showAlleyCutscene3DO() { if (finished) { // Fade out - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(5); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(5); finished = _music->waitUntilMSec(84400, 0, 0, 2000); } @@ -753,17 +835,17 @@ bool ScalpelEngine::showAlleyCutscene3DO() { if (finished) { // Fade out - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(5); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(5); } if (finished) { // "Early the following morning on Baker Street..." ImageFile3DO titleImage_EarlyTheFollowingMorning("title3.cel", kImageFile3DOType_Cel); - _screen->_backBuffer1.transBlitFrom(titleImage_EarlyTheFollowingMorning[0]._frame, Common::Point(35, 51)); + screen._backBuffer1.transBlitFrom(titleImage_EarlyTheFollowingMorning[0]._frame, Common::Point(35, 51)); // Fade in - _screen->fadeIntoScreen3DO(4); + screen.fadeIntoScreen3DO(4); finished = _music->waitUntilMSec(96700, 0, 0, 3000); } @@ -771,12 +853,13 @@ bool ScalpelEngine::showAlleyCutscene3DO() { } bool ScalpelEngine::showStreetCutscene3DO() { + Scalpel3DOScreen &screen = *(Scalpel3DOScreen *)_screen; bool finished = true; if (finished) { // fade out "Early the following morning..." - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(4); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(4); // wait for music a bit finished = _music->waitUntilMSec(100300, 0, 0, 1000); @@ -795,8 +878,8 @@ bool ScalpelEngine::showStreetCutscene3DO() { if (finished) { // Fade out - _screen->_backBuffer1.clear(); - _screen->fadeIntoScreen3DO(4); + screen._backBuffer1.clear(); + screen.fadeIntoScreen3DO(4); } return finished; @@ -1155,6 +1238,181 @@ void ScalpelEngine::flushBrumwellMirror() { _screen->slamArea(137, 18, 47, 56); } + +void ScalpelEngine::showScummVMSaveDialog() { + GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true); + + int slot = dialog->runModalWithCurrentTarget(); + if (slot >= 0) { + Common::String desc = dialog->getResultString(); + + saveGameState(slot, desc); + } + + delete dialog; +} + +void ScalpelEngine::showScummVMRestoreDialog() { + GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false); + + int slot = dialog->runModalWithCurrentTarget(); + if (slot >= 0) { + loadGameState(slot); + } + + delete dialog; +} + +bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::Point &pos, bool isPortrait) { + Scalpel3DOScreen &screen = *(Scalpel3DOScreen *)_screen; + Scalpel3DOMovieDecoder *videoDecoder = new Scalpel3DOMovieDecoder(); + Graphics::Surface tempSurface; + + Common::Point framePos(pos.x, pos.y); + ImageFrame *frameImage = nullptr; + bool frameShown = false; + + if (!videoDecoder->loadFile(filename)) { + warning("Scalpel3DOMoviePlay: could not open '%s'", filename.c_str()); + return false; + } + + bool halfSize = isPortrait && !_isScreenDoubled; + if (isPortrait) { + // only for portrait videos, not for EA intro logo and such + if ((framePos.x >= 8) && (framePos.y >= 8)) { // safety check + framePos.x -= 8; + framePos.y -= 8; // frame is 8 pixels on left + top, and 7 pixels on right + bottom + } + + ImageFile3DO *frameImageFile = new ImageFile3DO("vidframe.cel", kImageFile3DOType_Cel); + frameImage = &(*frameImageFile)[0]; + } + + bool skipVideo = false; + //byte bytesPerPixel = videoDecoder->getPixelFormat().bytesPerPixel; + uint16 width = videoDecoder->getWidth(); + uint16 height = videoDecoder->getHeight(); + //uint16 pitch = videoDecoder->getWidth() * bytesPerPixel; + + _events->clearEvents(); + videoDecoder->start(); + + // If we're to show the movie at half-size, we'll need a temporary intermediate surface + if (halfSize) + tempSurface.create(width / 2, height / 2, _screen->getPixelFormat()); + + while (!shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) { + if (videoDecoder->needsUpdate()) { + const Graphics::Surface *frame = videoDecoder->decodeNextFrame(); + + if (frame) { + if (halfSize) { + // movies are 152 x 200 + + // Downscale, but calculate average color out of 4 pixels and put that average into the target pixel + // TODO: 3DO actually did pixel weighting, exact details about this are unknown + // It's also unknown what 3DO exactly did for interpolation + // and it's also unknown atm if the CinePak videos contained pixel weighting information + + if ((height & 1) || (width & 1)) { + error("Scalpel3DOMoviePlay: critical error, half-size requested on video with uneven height/width"); + } + + for (int downscaleY = 0; downscaleY < height / 2; downscaleY++) { + const uint16 *downscaleSource1Ptr = (const uint16 *)frame->getBasePtr(0, downscaleY * 2); + const uint16 *downscaleSource2Ptr = (const uint16 *)frame->getBasePtr(0, (downscaleY * 2) + 1); + uint16 *downscaleTargetPtr = (uint16 *)tempSurface.getBasePtr(0, downscaleY); + + for (int downscaleX = 0; downscaleX < width / 2; downscaleX++) { + // get 4 pixel colors + uint16 downscaleColor = *downscaleSource1Ptr; + uint32 downscaleRed = downscaleColor >> 11; // 5 bits + uint32 downscaleGreen = (downscaleColor >> 5) & 0x3f; // 6 bits + uint32 downscaleBlue = downscaleColor & 0x1f; + + downscaleSource1Ptr++; + downscaleColor = *downscaleSource1Ptr; + downscaleRed += downscaleColor >> 11; + downscaleGreen += (downscaleColor >> 5) & 0x3f; + downscaleBlue += downscaleColor & 0x1f; + + downscaleColor = *downscaleSource2Ptr; + downscaleRed += downscaleColor >> 11; + downscaleGreen += (downscaleColor >> 5) & 0x3f; + downscaleBlue += downscaleColor & 0x1f; + + downscaleSource2Ptr++; + downscaleColor = *downscaleSource2Ptr; + downscaleRed += downscaleColor >> 11; + downscaleGreen += (downscaleColor >> 5) & 0x3f; + downscaleBlue += downscaleColor & 0x1f; + + // Divide colors by 4, so that we get the average + downscaleRed = downscaleRed >> 2; + downscaleGreen = downscaleGreen >> 2; + downscaleBlue = downscaleBlue >> 2; + + // write new color to target pixel + downscaleColor = (downscaleRed << 11) | (downscaleGreen << 5) | downscaleBlue; + *downscaleTargetPtr = downscaleColor; + + downscaleSource1Ptr++; + downscaleSource2Ptr++; + downscaleTargetPtr++; + } + } + + // Point the drawing frame to the temporary surface + frame = &tempSurface; + } + + if (isPortrait && !frameShown) { + // Draw the frame (not the frame of the video, but a frame around the video) itself + _screen->transBlitFrom(frameImage->_frame, framePos); + frameShown = true; + } + + if (isPortrait && !halfSize) { + screen.rawBlitFrom(*frame, Common::Point(pos.x * 2, pos.y * 2)); + } else { + _screen->blitFrom(*frame, pos); + } + + _screen->update(); + } + } + + _events->pollEventsAndWait(); + _events->setButtonState(); + + if (_events->kbHit()) { + Common::KeyState keyState = _events->getKey(); + if (keyState.keycode == Common::KEYCODE_ESCAPE) + skipVideo = true; + } else if (_events->_pressed) { + skipVideo = true; + } + } + + if (halfSize) + tempSurface.free(); + + videoDecoder->close(); + delete videoDecoder; + + if (halfSize) { + delete frameImage; + } + + // Restore scene + screen._backBuffer1.blitFrom(screen._backBuffer2); + _scene->updateBackground(); + screen.slamArea(0, 0, screen.w(), CONTROLS_Y); + + return !skipVideo; +} + } // End of namespace Scalpel } // End of namespace Sherlock diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h index cb1cb20492..af4d72a7d7 100644 --- a/engines/sherlock/scalpel/scalpel.h +++ b/engines/sherlock/scalpel/scalpel.h @@ -30,25 +30,37 @@ namespace Sherlock { namespace Scalpel { -enum { - BUTTON_TOP = 233, - BUTTON_MIDDLE = 244, - BUTTON_BOTTOM = 248, - COMMAND_FOREGROUND = 15, - COMMAND_HIGHLIGHTED = 10, - COMMAND_NULL = 248, - INFO_FOREGROUND = 11, - INFO_BACKGROUND = 1, - INV_FOREGROUND = 14, - INV_BACKGROUND = 1, - PEN_COLOR = 250 -}; +extern uint BUTTON_TOP; +extern uint BUTTON_MIDDLE; +extern uint BUTTON_BOTTOM; +extern uint COMMAND_FOREGROUND; +extern uint COMMAND_HIGHLIGHTED; +extern uint COMMAND_NULL; +extern uint INFO_FOREGROUND; +extern uint INFO_BACKGROUND; +extern uint INV_FOREGROUND; +extern uint INV_BACKGROUND; +extern uint PEN_COLOR; +extern uint INFO_BLACK; +extern uint BORDER_COLOR; +extern uint COMMAND_BACKGROUND; +extern uint BUTTON_BACKGROUND; +extern uint TALK_FOREGROUND; +extern uint TALK_NULL; class ScalpelEngine : public SherlockEngine { private: Darts *_darts; int _mapResult; + /** + * Initialize graphics mode + */ + void setupGraphics(); + + /** + * Show the 3DO splash screen + */ bool show3DOSplash(); /** @@ -124,6 +136,21 @@ public: * This clears the mirror in scene 12 (mansion drawing room) in case anything messed draw over it */ void flushBrumwellMirror(); + + /** + * Show the ScummVM restore savegame dialog + */ + void showScummVMSaveDialog(); + + /** + * Show the ScummVM restore savegame dialog + */ + void showScummVMRestoreDialog(); + + /** + * Play back a 3do movie + */ + bool play3doMovie(const Common::String &filename, const Common::Point &pos, bool isPortrait = false); }; } // End of namespace Scalpel diff --git a/engines/sherlock/scalpel/scalpel_people.cpp b/engines/sherlock/scalpel/scalpel_people.cpp index 0a9d510df5..924095cd50 100644 --- a/engines/sherlock/scalpel/scalpel_people.cpp +++ b/engines/sherlock/scalpel/scalpel_people.cpp @@ -315,8 +315,8 @@ void ScalpelPerson::setWalking() { } // See if the new walk sequence is the same as the old. If it's a new one, - // we need to reset the frame number to zero so it's animation starts at - // it's beginning. Otherwise, if it's the same sequence, we can leave it + // we need to reset the frame number to zero so its animation starts at + // its beginning. Otherwise, if it's the same sequence, we can leave it // as is, so it keeps the animation going at wherever it was up to if (_sequenceNumber != _oldWalkSequence) _frameNumber = 0; @@ -469,8 +469,7 @@ void ScalpelPeople::setTalkSequence(int speaker, int sequenceNum) { if (obj._seqSize < MAX_TALK_SEQUENCES) { warning("Tried to copy too many talk frames"); - } - else { + } else { for (int idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) { obj._sequences[idx] = people._characters[speaker]._talkSequences[idx]; if (idx > 0 && !obj._sequences[idx] && !obj._sequences[idx - 1]) diff --git a/engines/sherlock/scalpel/scalpel_people.h b/engines/sherlock/scalpel/scalpel_people.h index 941c2dc274..2ab6f5bc7d 100644 --- a/engines/sherlock/scalpel/scalpel_people.h +++ b/engines/sherlock/scalpel/scalpel_people.h @@ -52,7 +52,7 @@ public: virtual void synchronize(Serializer &s); /** - * This adjusts the sprites position, as well as it's animation sequence: + * This adjusts the sprites position, as well as its animation sequence: */ virtual void adjustSprite(); diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp index 999393fdcb..b2c7339363 100644 --- a/engines/sherlock/scalpel/scalpel_scene.cpp +++ b/engines/sherlock/scalpel/scalpel_scene.cpp @@ -732,8 +732,7 @@ int ScalpelScene::findBgShape(const Common::Point &pt) { && o._aType <= PERSON) { if (o.getNewBounds().contains(pt)) return idx; - } - else if (o._type == NO_SHAPE) { + } else if (o._type == NO_SHAPE) { if (o.getNoShapeBounds().contains(pt)) return idx; } diff --git a/engines/sherlock/scalpel/scalpel_screen.cpp b/engines/sherlock/scalpel/scalpel_screen.cpp index 2096dabcdf..71bcca5dc5 100644 --- a/engines/sherlock/scalpel/scalpel_screen.cpp +++ b/engines/sherlock/scalpel/scalpel_screen.cpp @@ -45,7 +45,7 @@ void ScalpelScreen::makeButton(const Common::Rect &bounds, int textX, COMMAND_FOREGROUND, "%s", str.c_str() + 1); } -void ScalpelScreen::buttonPrint(const Common::Point &pt, byte color, bool slamIt, +void ScalpelScreen::buttonPrint(const Common::Point &pt, uint color, bool slamIt, const Common::String &str) { int xStart = pt.x - stringWidth(str) / 2; @@ -88,6 +88,255 @@ void ScalpelScreen::makeField(const Common::Rect &r) { _backBuffer->vLine(r.right - 1, r.top + 1, r.bottom - 2, BUTTON_TOP); } +/*----------------------------------------------------------------*/ + +void Scalpel3DOScreen::blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds) { + if (!_vm->_isScreenDoubled) { + ScalpelScreen::blitFrom(src, pt, srcBounds); + return; + } + + Common::Rect srcRect = srcBounds; + Common::Rect destRect(pt.x, pt.y, pt.x + srcRect.width(), pt.y + srcRect.height()); + + if (!srcRect.isValidRect() || !clip(srcRect, destRect)) + return; + + // Add dirty area remapped to the 640x200 surface + addDirtyRect(Common::Rect(destRect.left * 2, destRect.top * 2, destRect.right * 2, destRect.bottom * 2)); + + // Transfer the area, doubling each pixel + for (int yp = 0; yp < srcRect.height(); ++yp) { + const uint16 *srcP = (const uint16 *)src.getBasePtr(srcRect.left, srcRect.top + yp); + uint16 *destP = (uint16 *)getBasePtr(destRect.left * 2, (destRect.top + yp) * 2); + + for (int xp = srcRect.left; xp < srcRect.right; ++xp, ++srcP, destP += 2) { + *destP = *srcP; + *(destP + 1) = *srcP; + *(destP + 640) = *srcP; + *(destP + 640 + 1) = *srcP; + } + } +} + +void Scalpel3DOScreen::transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, + bool flipped, int overrideColor) { + if (!_vm->_isScreenDoubled) { + ScalpelScreen::transBlitFromUnscaled(src, pt, flipped, overrideColor); + return; + } + + Common::Rect drawRect(0, 0, src.w, src.h); + Common::Rect destRect(pt.x, pt.y, pt.x + src.w, pt.y + src.h); + + // Clip the display area to on-screen + if (!clip(drawRect, destRect)) + // It's completely off-screen + return; + + if (flipped) + drawRect = Common::Rect(src.w - drawRect.right, src.h - drawRect.bottom, + src.w - drawRect.left, src.h - drawRect.top); + + Common::Point destPt(destRect.left, destRect.top); + addDirtyRect(Common::Rect(destPt.x * 2, destPt.y * 2, (destPt.x + drawRect.width()) * 2, + (destPt.y + drawRect.height()) * 2)); + + assert(src.format.bytesPerPixel == 2 && _surface.format.bytesPerPixel == 2); + + for (int yp = 0; yp < drawRect.height(); ++yp) { + const uint16 *srcP = (const uint16 *)src.getBasePtr( + flipped ? drawRect.right - 1 : drawRect.left, drawRect.top + yp); + uint16 *destP = (uint16 *)getBasePtr(destPt.x * 2, (destPt.y + yp) * 2); + + for (int xp = 0; xp < drawRect.width(); ++xp, destP += 2) { + // RGB 0, 0, 0 -> transparent on 3DO + if (*srcP) { + *destP = *srcP; + *(destP + 1) = *srcP; + *(destP + 640) = *srcP; + *(destP + 640 + 1) = *srcP; + } + + srcP = flipped ? srcP - 1 : srcP + 1; + } + } +} + +void Scalpel3DOScreen::fillRect(const Common::Rect &r, uint color) { + if (_vm->_isScreenDoubled) + ScalpelScreen::fillRect(Common::Rect(r.left * 2, r.top * 2, r.right * 2, r.bottom * 2), color); + else + ScalpelScreen::fillRect(r, color); +} + +void Scalpel3DOScreen::fadeIntoScreen3DO(int speed) { + Events &events = *_vm->_events; + uint16 *currentScreenBasePtr = (uint16 *)getPixels(); + uint16 *targetScreenBasePtr = (uint16 *)_backBuffer->getPixels(); + uint16 currentScreenPixel = 0; + uint16 targetScreenPixel = 0; + + uint16 currentScreenPixelRed = 0; + uint16 currentScreenPixelGreen = 0; + uint16 currentScreenPixelBlue = 0; + + uint16 targetScreenPixelRed = 0; + uint16 targetScreenPixelGreen = 0; + uint16 targetScreenPixelBlue = 0; + + uint16 screenWidth = SHERLOCK_SCREEN_WIDTH; + uint16 screenHeight = SHERLOCK_SCREEN_HEIGHT; + uint16 screenX = 0; + uint16 screenY = 0; + uint16 pixelsChanged = 0; + + clearDirtyRects(); + + do { + pixelsChanged = 0; + uint16 *currentScreenPtr = currentScreenBasePtr; + uint16 *targetScreenPtr = targetScreenBasePtr; + + for (screenY = 0; screenY < screenHeight; screenY++) { + for (screenX = 0; screenX < screenWidth; screenX++) { + currentScreenPixel = *currentScreenPtr; + targetScreenPixel = *targetScreenPtr; + + if (currentScreenPixel != targetScreenPixel) { + // pixel doesn't match, adjust accordingly + currentScreenPixelRed = currentScreenPixel & 0xF800; + currentScreenPixelGreen = currentScreenPixel & 0x07E0; + currentScreenPixelBlue = currentScreenPixel & 0x001F; + targetScreenPixelRed = targetScreenPixel & 0xF800; + targetScreenPixelGreen = targetScreenPixel & 0x07E0; + targetScreenPixelBlue = targetScreenPixel & 0x001F; + + if (currentScreenPixelRed != targetScreenPixelRed) { + if (currentScreenPixelRed < targetScreenPixelRed) { + currentScreenPixelRed += 0x0800; + } else { + currentScreenPixelRed -= 0x0800; + } + } + if (currentScreenPixelGreen != targetScreenPixelGreen) { + // Adjust +2/-2 because we are running RGB555 at RGB565 + if (currentScreenPixelGreen < targetScreenPixelGreen) { + currentScreenPixelGreen += 0x0040; + } else { + currentScreenPixelGreen -= 0x0040; + } + } + if (currentScreenPixelBlue != targetScreenPixelBlue) { + if (currentScreenPixelBlue < targetScreenPixelBlue) { + currentScreenPixelBlue += 0x0001; + } else { + currentScreenPixelBlue -= 0x0001; + } + } + + uint16 v = currentScreenPixelRed | currentScreenPixelGreen | currentScreenPixelBlue; + *currentScreenPtr = v; + if (_vm->_isScreenDoubled) { + *(currentScreenPtr + 1) = v; + *(currentScreenPtr + 640) = v; + *(currentScreenPtr + 640 + 1) = v; + } + + pixelsChanged++; + } + + currentScreenPtr += _vm->_isScreenDoubled ? 2 : 1; + targetScreenPtr++; + } + + if (_vm->_isScreenDoubled) + currentScreenPtr += 640; + } + + // Too much considered dirty at the moment + if (_vm->_isScreenDoubled) + addDirtyRect(Common::Rect(0, 0, screenWidth * 2, screenHeight * 2)); + else + addDirtyRect(Common::Rect(0, 0, screenWidth, screenHeight)); + + events.pollEvents(); + events.delay(10 * speed); + } while ((pixelsChanged) && (!_vm->shouldQuit())); +} + +void Scalpel3DOScreen::blitFrom3DOcolorLimit(uint16 limitColor) { + uint16 *currentScreenPtr = (uint16 *)getPixels(); + uint16 *targetScreenPtr = (uint16 *)_backBuffer->getPixels(); + uint16 currentScreenPixel = 0; + + uint16 screenWidth = SHERLOCK_SCREEN_WIDTH; + uint16 screenHeight = SHERLOCK_SCREEN_HEIGHT; + uint16 screenX = 0; + uint16 screenY = 0; + + uint16 currentScreenPixelRed = 0; + uint16 currentScreenPixelGreen = 0; + uint16 currentScreenPixelBlue = 0; + + uint16 limitPixelRed = limitColor & 0xF800; + uint16 limitPixelGreen = limitColor & 0x07E0; + uint16 limitPixelBlue = limitColor & 0x001F; + + for (screenY = 0; screenY < screenHeight; screenY++) { + for (screenX = 0; screenX < screenWidth; screenX++) { + currentScreenPixel = *targetScreenPtr; + + currentScreenPixelRed = currentScreenPixel & 0xF800; + currentScreenPixelGreen = currentScreenPixel & 0x07E0; + currentScreenPixelBlue = currentScreenPixel & 0x001F; + + if (currentScreenPixelRed < limitPixelRed) + currentScreenPixelRed = limitPixelRed; + if (currentScreenPixelGreen < limitPixelGreen) + currentScreenPixelGreen = limitPixelGreen; + if (currentScreenPixelBlue < limitPixelBlue) + currentScreenPixelBlue = limitPixelBlue; + + uint16 v = currentScreenPixelRed | currentScreenPixelGreen | currentScreenPixelBlue; + *currentScreenPtr = v; + if (_vm->_isScreenDoubled) { + *(currentScreenPtr + 1) = v; + *(currentScreenPtr + 640) = v; + *(currentScreenPtr + 640 + 1) = v; + } + + currentScreenPtr += _vm->_isScreenDoubled ? 2 : 1; + targetScreenPtr++; + } + + if (_vm->_isScreenDoubled) + currentScreenPtr += 640; + } + + // Too much considered dirty at the moment + if (_vm->_isScreenDoubled) + addDirtyRect(Common::Rect(0, 0, screenWidth * 2, screenHeight * 2)); + else + addDirtyRect(Common::Rect(0, 0, screenWidth, screenHeight)); +} + +uint16 Scalpel3DOScreen::w() const { + return _vm->_isScreenDoubled ? _surface.w / 2 : _surface.w; +} + +uint16 Scalpel3DOScreen::h() const { + return _vm->_isScreenDoubled ? _surface.h / 2 : _surface.h; +} + +void Scalpel3DOScreen::rawBlitFrom(const Graphics::Surface &src, const Common::Point &pt) { + Common::Rect srcRect(0, 0, src.w, src.h); + Common::Rect destRect(pt.x, pt.y, pt.x + src.w, pt.y + src.h); + + addDirtyRect(destRect); + _surface.copyRectToSurface(src, destRect.left, destRect.top, srcRect); +} + } // End of namespace Scalpel } // End of namespace Sherlock diff --git a/engines/sherlock/scalpel/scalpel_screen.h b/engines/sherlock/scalpel/scalpel_screen.h index 472fe9e220..d6018a44a0 100644 --- a/engines/sherlock/scalpel/scalpel_screen.h +++ b/engines/sherlock/scalpel/scalpel_screen.h @@ -45,7 +45,7 @@ public: * Prints an interface command with the first letter highlighted to indicate * what keyboard shortcut is associated with it */ - void buttonPrint(const Common::Point &pt, byte color, bool slamIt, const Common::String &str); + void buttonPrint(const Common::Point &pt, uint color, bool slamIt, const Common::String &str); /** * Draw a panel in the back buffer with a raised area effect around the edges @@ -59,6 +59,44 @@ public: void makeField(const Common::Rect &r); }; +class Scalpel3DOScreen : public ScalpelScreen { +protected: + /** + * Draws a sub-section of a surface at a given position within this surface + * Overriden for the 3DO to automatically double the size of everything to the underlying 640x400 surface + */ + virtual void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds); + + /** + * Draws a surface at a given position within this surface with transparency + */ + virtual void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, + int overrideColor); +public: + Scalpel3DOScreen(SherlockEngine *vm) : ScalpelScreen(vm) {} + virtual ~Scalpel3DOScreen() {} + + /** + * Draws a sub-section of a surface at a given position within this surface + */ + void rawBlitFrom(const Graphics::Surface &src, const Common::Point &pt); + + /** + * Fade backbuffer 1 into screen (3DO RGB!) + */ + void fadeIntoScreen3DO(int speed); + + void blitFrom3DOcolorLimit(uint16 color); + + /** + * Fill a given area of the surface with a given color + */ + virtual void fillRect(const Common::Rect &r, uint color); + + virtual uint16 w() const; + virtual uint16 h() const; +}; + } // End of namespace Scalpel } // End of namespace Sherlock diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 9b38a95c64..88a718ea4e 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -171,6 +171,18 @@ ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) { } +void ScalpelTalk::talkTo(const Common::String filename) { + ScalpelUserInterface &ui = *(ScalpelUserInterface *)_vm->_ui; + + Talk::talkTo(filename); + + if (filename == "Tube59c") { + // WORKAROUND: Original game bug causes the results of testing the powdery substance + // to disappear too quickly. Introduce a delay to allow it to be properly displayed + ui._menuCounter = 30; + } +} + void ScalpelTalk::talkInterface(const byte *&str) { FixedText &fixedText = *_vm->_fixedText; People &people = *_vm->_people; @@ -199,8 +211,7 @@ void ScalpelTalk::talkInterface(const byte *&str) { if (ui._windowOpen) { screen.print(Common::Point(16, _yp), TALK_FOREGROUND, "%s", people._characters[_speaker & 127]._name); - } - else { + } else { screen.gPrint(Common::Point(16, _yp - 1), TALK_FOREGROUND, "%s", people._characters[_speaker & 127]._name); _openTalkWindow = true; @@ -222,8 +233,7 @@ void ScalpelTalk::talkInterface(const byte *&str) { --idx; --_charCount; } - } - else { + } else { _endStr = true; } @@ -242,17 +252,14 @@ void ScalpelTalk::talkInterface(const byte *&str) { if (_speaker != -1) { if (ui._windowOpen) { screen.print(Common::Point(16, _yp), COMMAND_FOREGROUND, "%s", lineStr.c_str()); - } - else { + } else { screen.gPrint(Common::Point(16, _yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str()); _openTalkWindow = true; } - } - else { + } else { if (ui._windowOpen) { screen.print(Common::Point(16, _yp), COMMAND_FOREGROUND, "%s", lineStr.c_str()); - } - else { + } else { screen.gPrint(Common::Point(16, _yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str()); _openTalkWindow = true; } @@ -521,6 +528,11 @@ OpcodeReturn ScalpelTalk::cmdSummonWindow(const byte *&str) { return RET_SUCCESS; } +void ScalpelTalk::loadTalkFile(const Common::String &filename) { + Talk::loadTalkFile(filename); + _3doSpeechIndex = 0; +} + void ScalpelTalk::talkWait(const byte *&str) { UserInterface &ui = *_vm->_ui; bool pauseFlag = _pauseFlag; @@ -541,12 +553,49 @@ void ScalpelTalk::nothingToSay() { } void ScalpelTalk::switchSpeaker() { - // If it's the 3DO, pass on to start the actor's conversation movie - if (IS_3DO) - talk3DOMovieTrigger(_3doSpeechIndex++); } -void ScalpelTalk::talk3DOMovieTrigger(int subIndex) { +int ScalpelTalk::waitForMore(int delay) { + Events &events = *_vm->_events; + + if (!IS_3DO) { + return Talk::waitForMore(delay); + } + + // Hide the cursor + events.hideCursor(); + events.wait(1); + + switchSpeaker(); + + // Play the video + talk3DOMovieTrigger(_3doSpeechIndex++); + + // Adjust _talkStealth mode: + // mode 1 - It was by a pause without stealth being on before the pause, so reset back to 0 + // mode 3 - It was set by a pause with stealth being on before the pause, to set it to active + // mode 0/2 (Inactive/active) No change + switch (_talkStealth) { + case 1: + _talkStealth = 0; + break; + case 2: + _talkStealth = 2; + break; + default: + break; + } + + events.showCursor(); + events._pressed = events._released = false; + + return 254; +} + +bool ScalpelTalk::talk3DOMovieTrigger(int subIndex) { + ScalpelEngine &vm = *(ScalpelEngine *)_vm; + Screen &screen = *_vm->_screen; + // Find out a few things that we need int userSelector = _vm->_ui->_selector; int scriptSelector = _scriptSelect; @@ -560,15 +609,14 @@ void ScalpelTalk::talk3DOMovieTrigger(int subIndex) { if (scriptSelector >= 0) { // Script-selected dialog selector = scriptSelector; - subIndex--; // for scripts we adjust subIndex, b/c we won't get called from doTalkControl() } else { - warning("talk3DOMovieTrigger: unable to find selector"); - return; + warning("talk3DOMovieTrigger: unable to find selector"); + return true; } } // Make a quick update, so that current text is shown on screen - _vm->_screen->update(); + screen.update(); // Figure out that movie filename Common::String movieFilename; @@ -590,10 +638,45 @@ void ScalpelTalk::talk3DOMovieTrigger(int subIndex) { warning("selector: %d", selector); warning("subindex: %d", subIndex); - Scalpel3DOMoviePlay(movieFilename.c_str(), Common::Point(5, 5)); + bool result = vm.play3doMovie(movieFilename, get3doPortraitPosition(), true); // Restore screen HACK _vm->_screen->makeAllDirty(); + + return result; +} + +Common::Point ScalpelTalk::get3doPortraitPosition() const { + // TODO: This current method is only an assumption of how the original figured + // out where to place each character's portrait movie. + People &people = *_vm->_people; + Scene &scene = *_vm->_scene; + const int PORTRAIT_W = 100; + const int PORTRAIT_H = 76; + + if (_speaker == -1) + return Common::Point(); + + // Get the position of the character + Common::Point pt; + if (_speaker == HOLMES) { + pt = Common::Point(people[HOLMES]._position.x / FIXED_INT_MULTIPLIER, + people[HOLMES]._position.y / FIXED_INT_MULTIPLIER); + } else { + int objNum = people.findSpeaker(_speaker); + if (objNum == -1) + return Common::Point(); + + pt = scene._bgShapes[objNum]._position; + } + + // Adjust the top-left so the center of the portrait will be on the character, + // but ensure the portrait will be entirely on-screen + pt -= Common::Point(PORTRAIT_W / 2, PORTRAIT_H / 2); + pt.x = CLIP((int)pt.x, 10, SHERLOCK_SCREEN_WIDTH - 10 - PORTRAIT_W); + pt.y = CLIP((int)pt.y, 10, CONTROLS_Y - PORTRAIT_H - 10); + + return pt; } void ScalpelTalk::drawInterface() { diff --git a/engines/sherlock/scalpel/scalpel_talk.h b/engines/sherlock/scalpel/scalpel_talk.h index 4d13258985..4d54273f4a 100644 --- a/engines/sherlock/scalpel/scalpel_talk.h +++ b/engines/sherlock/scalpel/scalpel_talk.h @@ -39,6 +39,11 @@ class ScalpelTalk : public Talk { private: Common::Stack<SequenceEntry> _sequenceStack; + /** + * Get the center position for the current speaker, if any + */ + Common::Point get3doPortraitPosition() const; + OpcodeReturn cmdSwitchSpeaker(const byte *&str); OpcodeReturn cmdAssignPortraitLocation(const byte *&str); OpcodeReturn cmdGotoScene(const byte *&str); @@ -84,6 +89,28 @@ public: virtual ~ScalpelTalk() {} /** + * Opens the talk file 'talk.tlk' and searches the index for the specified + * conversation. If found, the data for that conversation is loaded + */ + virtual void loadTalkFile(const Common::String &filename); + + /** + * Called whenever a conversation or item script needs to be run. For standard conversations, + * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly + * instead of waiting for a statement option. + * @remarks It seems that at some point, all item scripts were set up to use this as well. + * In their case, the conversation display is simply suppressed, and control is passed on to + * doScript to implement whatever action is required. + */ + virtual void talkTo(const Common::String filename); + + /** + * When the talk window has been displayed, waits a period of time proportional to + * the amount of text that's been displayed + */ + virtual int waitForMore(int delay); + + /** * Draws the interface for conversation display */ void drawInterface(); @@ -102,7 +129,7 @@ public: /** * Trigger to play a 3DO talk dialog movie */ - void talk3DOMovieTrigger(int subIndex); + bool talk3DOMovieTrigger(int subIndex); /** * Push the details of a passed object onto the saved sequences stack diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index a67d464a11..be8f1aaa0c 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -65,6 +65,7 @@ const int INVENTORY_POINTS[8][3] = { }; const char COMMANDS[13] = "LMTPOCIUGJFS"; +const char COMMANDS_3DO[13] = "LMTPOCIUGSFF"; const char INVENTORY_COMMANDS[9] = { "ELUG-+,." }; const char *const PRESS_KEY_FOR_MORE = "Press any Key for More."; const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue."; @@ -118,10 +119,18 @@ void ScalpelUserInterface::drawInterface(int bufferNum) { const ImageFrame &src = (*_controlPanel)[0]; int16 x = (!IS_3DO) ? 0 : UI_OFFSET_3DO; - if (bufferNum & 1) + if (bufferNum & 1) { + if (IS_3DO) + screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y, + SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BLACK); screen._backBuffer1.transBlitFrom(src, Common::Point(x, CONTROLS_Y)); - if (bufferNum & 2) + } + if (bufferNum & 2) { + if (IS_3DO) + screen._backBuffer2.fillRect(Common::Rect(0, CONTROLS_Y, + SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BLACK); screen._backBuffer2.transBlitFrom(src, Common::Point(x, CONTROLS_Y)); + } if (bufferNum == 3) screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK); } @@ -459,8 +468,8 @@ void ScalpelUserInterface::toggleButton(int num) { void ScalpelUserInterface::clearInfo() { if (_infoFlag) { - _vm->_screen->vgaBar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19, - INFO_LINE + 10), INFO_BLACK); + _vm->_screen->vgaBar(Common::Rect(IS_3DO ? 33 : 16, INFO_LINE, + SHERLOCK_SCREEN_WIDTH - (IS_3DO ? 33 : 19), INFO_LINE + 10), INFO_BLACK); _infoFlag = false; _oldLook = -1; } @@ -860,7 +869,7 @@ void ScalpelUserInterface::doEnvControl() { // Check whether there are more pending D keys pressed moreKeys = false; if (events.kbHit()) { - Common::KeyState keyState; + Common::KeyState keyState = events.getKey(); _key = toupper(keyState.keycode); moreKeys = _key == 'D'; @@ -1264,10 +1273,12 @@ void ScalpelUserInterface::doLookControl() { } void ScalpelUserInterface::doMainControl() { + ScalpelEngine &vm = *(ScalpelEngine *)_vm; Events &events = *_vm->_events; ScalpelInventory &inv = *(ScalpelInventory *)_vm->_inventory; ScalpelSaveManager &saves = *(ScalpelSaveManager *)_vm->_saves; Common::Point pt = events.mousePos(); + const char *commands = IS_3DO ? COMMANDS_3DO : COMMANDS; if ((events._pressed || events._released) && pt.y > CONTROLS_Y) { events.clearKeyboard(); @@ -1282,7 +1293,7 @@ void ScalpelUserInterface::doMainControl() { r.right += UI_OFFSET_3DO - 1; } if (r.contains(pt)) - _key = COMMANDS[_temp]; + _key = commands[_temp]; } --_temp; } else if (_keyPress) { @@ -1290,8 +1301,8 @@ void ScalpelUserInterface::doMainControl() { _keyboardInput = true; if (_keyPress >= 'A' && _keyPress <= 'Z') { - const char *c = strchr(COMMANDS, _keyPress); - _temp = !c ? 12 : c - COMMANDS; + const char *c = strchr(commands, _keyPress); + _temp = !c ? 12 : c - commands; } else { _temp = 12; } @@ -1372,28 +1383,38 @@ void ScalpelUserInterface::doMainControl() { journalControl(); break; case 'F': - pushButton(10); + if (IS_3DO) { + if (_temp == 10) { + pushButton(10); + vm.showScummVMRestoreDialog(); + } else if (_temp == 11) { + pushButton(11); + vm.showScummVMSaveDialog(); + } + } else { + pushButton(10); - // Create a thumbnail of the current screen before the files dialog is shown, in case - // the user saves the game - saves.createThumbnail(); + // Create a thumbnail of the current screen before the files dialog is shown, in case + // the user saves the game + saves.createThumbnail(); - _selector = _oldSelector = -1; + _selector = _oldSelector = -1; - if (_vm->_showOriginalSavesDialog) { - // Show the original dialog - _menuMode = FILES_MODE; - saves.drawInterface(); - _windowOpen = true; - } else { - // Show the ScummVM GMM instead - _vm->_canLoadSave = true; - _vm->openMainMenuDialog(); - _vm->_canLoadSave = false; + if (_vm->_showOriginalSavesDialog) { + // Show the original dialog + _menuMode = FILES_MODE; + saves.drawInterface(); + _windowOpen = true; + } else { + // Show the ScummVM GMM instead + _vm->_canLoadSave = true; + _vm->openMainMenuDialog(); + _vm->_canLoadSave = false; + } } break; case 'S': - pushButton(11); + pushButton(IS_3DO ? 9 : 11); _menuMode = SETUP_MODE; Settings::show(_vm); break; @@ -1645,9 +1666,6 @@ void ScalpelUserInterface::doTalkControl() { sound._speechPlaying = false; } - if (IS_3DO) - // Trigger to play 3DO movie - talk.talk3DOMovieTrigger(0); talk.waitForMore(talk._statements[_selector]._statement.size()); if (talk._talkToAbort) diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h index 7829ffca9f..d88e607c2a 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.h +++ b/engines/sherlock/scalpel/scalpel_user_interface.h @@ -34,6 +34,7 @@ class Talk; namespace Scalpel { extern const char COMMANDS[13]; +extern const char COMMANDS_3DO[13]; extern const int MENU_POINTS[12][4]; extern const int INVENTORY_POINTS[8][3]; @@ -84,7 +85,7 @@ private: void lookScreen(const Common::Point &pt); /** - * Gets the item in the inventory the mouse is on and display's it's description + * Gets the item in the inventory the mouse is on and display's its description */ void lookInv(); diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp index 4eab01947a..014470dcc8 100644 --- a/engines/sherlock/scalpel/tsage/logo.cpp +++ b/engines/sherlock/scalpel/tsage/logo.cpp @@ -399,8 +399,9 @@ bool Logo::show(ScalpelEngine *vm) { for (int idx = 0; idx < 4; ++idx) logo->_objects[idx].update(); - events.wait(2); + events.delay(10); events.setButtonState(); + ++logo->_frameCounter; interrupted = vm->shouldQuit() || events.kbHit() || events._pressed; if (interrupted) { @@ -422,6 +423,7 @@ Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb") { // Initialize counter _counter = 0; + _frameCounter = 0; // Initialize wait frame counters _waitFrames = 0; @@ -476,7 +478,7 @@ void Logo::nextFrame() { Screen &screen = *_vm->_screen; if (_waitFrames) { - uint32 currFrame = _vm->_events->getFrameCounter(); + uint32 currFrame = _frameCounter; if (currFrame - _waitStartFrame < _waitFrames) { return; } @@ -485,7 +487,7 @@ void Logo::nextFrame() { } if (_animateFrames) { - uint32 currFrame = _vm->_events->getFrameCounter(); + uint32 currFrame = _frameCounter; if (currFrame > _animateStartFrame + _animateFrameDelay) { AnimationFrame animationFrame = _animateFrames[_animateFrame]; if (animationFrame.frame) { @@ -611,14 +613,14 @@ void Logo::nextFrame() { void Logo::waitFrames(uint frames) { _waitFrames = frames; - _waitStartFrame = _vm->_events->getFrameCounter(); + _waitStartFrame = _frameCounter; } void Logo::startAnimation(uint object, uint frameDelay, const AnimationFrame *frames) { _animateObject = object; _animateFrameDelay = frameDelay; _animateFrames = frames; - _animateStartFrame = _vm->_events->getFrameCounter(); + _animateStartFrame = _frameCounter; _animateFrame = 1; _objects[object]._frame = frames[0].frame; diff --git a/engines/sherlock/scalpel/tsage/logo.h b/engines/sherlock/scalpel/tsage/logo.h index c9fac00d9c..8e47ea42a1 100644 --- a/engines/sherlock/scalpel/tsage/logo.h +++ b/engines/sherlock/scalpel/tsage/logo.h @@ -195,7 +195,7 @@ class Logo { private: ScalpelEngine *_vm; TLib _lib; - int _counter; + int _counter, _frameCounter; bool _finished; byte _originalPalette[PALETTE_SIZE]; byte _palette1[PALETTE_SIZE]; diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 4e40032df9..ea12fafd7b 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -26,6 +26,7 @@ #include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_people.h" #include "sherlock/scalpel/scalpel_scene.h" +#include "sherlock/scalpel/scalpel_screen.h" #include "sherlock/tattoo/tattoo.h" #include "sherlock/tattoo/tattoo_scene.h" #include "sherlock/tattoo/tattoo_user_interface.h" @@ -1090,9 +1091,9 @@ void Scene::checkSceneFlags(bool flag) { for (uint idx = 0; idx < _bgShapes.size(); ++idx) { Object &o = _bgShapes[idx]; - bool objectFlag = true; if (o._requiredFlag[0] || o._requiredFlag[1]) { + bool objectFlag = true; if (o._requiredFlag[0] != 0) objectFlag = _vm->readFlags(o._requiredFlag[0]); if (o._requiredFlag[1] != 0) @@ -1282,7 +1283,7 @@ void Scene::transitionToScene() { } else { // fade in for 3DO screen.clear(); - screen.fadeIntoScreen3DO(3); + static_cast<Scalpel::Scalpel3DOScreen *>(_vm->_screen)->fadeIntoScreen3DO(3); } } else { screen.slamArea(screen._currentScroll.x, screen._currentScroll.y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT); diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp index 4233bca0cb..208487d0ca 100644 --- a/engines/sherlock/screen.cpp +++ b/engines/sherlock/screen.cpp @@ -30,15 +30,17 @@ namespace Sherlock { Screen *Screen::init(SherlockEngine *vm) { - if (vm->getGameID() == GType_SerratedScalpel) - return new Scalpel::ScalpelScreen(vm); - else + if (vm->getGameID() == GType_RoseTattoo) return new Screen(vm); + else if (vm->getPlatform() == Common::kPlatform3DO) + return new Scalpel::Scalpel3DOScreen(vm); + else + return new Scalpel::ScalpelScreen(vm); } Screen::Screen(SherlockEngine *vm) : Surface(g_system->getWidth(), g_system->getHeight()), _vm(vm), - _backBuffer1(g_system->getWidth(), g_system->getHeight()), - _backBuffer2(g_system->getWidth(), g_system->getHeight()), + _backBuffer1(vm->getGameID() == GType_RoseTattoo ? 640 : 320, vm->getGameID() == GType_RoseTattoo ? 480 : 200), + _backBuffer2(vm->getGameID() == GType_RoseTattoo ? 640 : 320, vm->getGameID() == GType_RoseTattoo ? 480 : 200), _backBuffer(&_backBuffer1) { _transitionSeed = 1; _fadeStyle = false; @@ -219,130 +221,6 @@ void Screen::verticalTransition() { } } -void Screen::fadeIntoScreen3DO(int speed) { - Events &events = *_vm->_events; - uint16 *currentScreenBasePtr = (uint16 *)getPixels(); - uint16 *targetScreenBasePtr = (uint16 *)_backBuffer->getPixels(); - uint16 currentScreenPixel = 0; - uint16 targetScreenPixel = 0; - - uint16 currentScreenPixelRed = 0; - uint16 currentScreenPixelGreen = 0; - uint16 currentScreenPixelBlue = 0; - - uint16 targetScreenPixelRed = 0; - uint16 targetScreenPixelGreen = 0; - uint16 targetScreenPixelBlue = 0; - - uint16 screenWidth = this->w(); - uint16 screenHeight = this->h(); - uint16 screenX = 0; - uint16 screenY = 0; - uint16 pixelsChanged = 0; - - _dirtyRects.clear(); - - do { - pixelsChanged = 0; - uint16 *currentScreenPtr = currentScreenBasePtr; - uint16 *targetScreenPtr = targetScreenBasePtr; - - for (screenY = 0; screenY < screenHeight; screenY++) { - for (screenX = 0; screenX < screenWidth; screenX++) { - currentScreenPixel = *currentScreenPtr; - targetScreenPixel = *targetScreenPtr; - - if (currentScreenPixel != targetScreenPixel) { - // pixel doesn't match, adjust accordingly - currentScreenPixelRed = currentScreenPixel & 0xF800; - currentScreenPixelGreen = currentScreenPixel & 0x07E0; - currentScreenPixelBlue = currentScreenPixel & 0x001F; - targetScreenPixelRed = targetScreenPixel & 0xF800; - targetScreenPixelGreen = targetScreenPixel & 0x07E0; - targetScreenPixelBlue = targetScreenPixel & 0x001F; - - if (currentScreenPixelRed != targetScreenPixelRed) { - if (currentScreenPixelRed < targetScreenPixelRed) { - currentScreenPixelRed += 0x0800; - } else { - currentScreenPixelRed -= 0x0800; - } - } - if (currentScreenPixelGreen != targetScreenPixelGreen) { - // Adjust +2/-2 because we are running RGB555 at RGB565 - if (currentScreenPixelGreen < targetScreenPixelGreen) { - currentScreenPixelGreen += 0x0040; - } else { - currentScreenPixelGreen -= 0x0040; - } - } - if (currentScreenPixelBlue != targetScreenPixelBlue) { - if (currentScreenPixelBlue < targetScreenPixelBlue) { - currentScreenPixelBlue += 0x0001; - } else { - currentScreenPixelBlue -= 0x0001; - } - } - *currentScreenPtr = currentScreenPixelRed | currentScreenPixelGreen | currentScreenPixelBlue; - pixelsChanged++; - } - - currentScreenPtr++; - targetScreenPtr++; - } - } - - // Too much considered dirty at the moment - addDirtyRect(Common::Rect(0, 0, screenWidth, screenHeight)); - - events.pollEvents(); - events.delay(10 * speed); - } while ((pixelsChanged) && (!_vm->shouldQuit())); -} - -void Screen::blitFrom3DOcolorLimit(uint16 limitColor) { - uint16 *currentScreenPtr = (uint16 *)getPixels(); - uint16 *targetScreenPtr = (uint16 *)_backBuffer->getPixels(); - uint16 currentScreenPixel = 0; - - uint16 screenWidth = this->w(); - uint16 screenHeight = this->h(); - uint16 screenX = 0; - uint16 screenY = 0; - - uint16 currentScreenPixelRed = 0; - uint16 currentScreenPixelGreen = 0; - uint16 currentScreenPixelBlue = 0; - - uint16 limitPixelRed = limitColor & 0xF800; - uint16 limitPixelGreen = limitColor & 0x07E0; - uint16 limitPixelBlue = limitColor & 0x001F; - - for (screenY = 0; screenY < screenHeight; screenY++) { - for (screenX = 0; screenX < screenWidth; screenX++) { - currentScreenPixel = *targetScreenPtr; - - currentScreenPixelRed = currentScreenPixel & 0xF800; - currentScreenPixelGreen = currentScreenPixel & 0x07E0; - currentScreenPixelBlue = currentScreenPixel & 0x001F; - - if (currentScreenPixelRed < limitPixelRed) - currentScreenPixelRed = limitPixelRed; - if (currentScreenPixelGreen < limitPixelGreen) - currentScreenPixelGreen = limitPixelGreen; - if (currentScreenPixelBlue < limitPixelBlue) - currentScreenPixelBlue = limitPixelBlue; - - *currentScreenPtr = currentScreenPixelRed | currentScreenPixelGreen | currentScreenPixelBlue; - currentScreenPtr++; - targetScreenPtr++; - } - } - - // Too much considered dirty at the moment - addDirtyRect(Common::Rect(0, 0, screenWidth, screenHeight)); -} - void Screen::restoreBackground(const Common::Rect &r) { if (r.width() > 0 && r.height() > 0) _backBuffer1.blitFrom(_backBuffer2, Common::Point(r.left, r.top), r); @@ -460,7 +338,7 @@ void Screen::blockMove() { blockMove(Common::Rect(0, 0, w(), h())); } -void Screen::print(const Common::Point &pt, byte color, const char *formatStr, ...) { +void Screen::print(const Common::Point &pt, uint color, const char *formatStr, ...) { // Create the string to display va_list args; va_start(args, formatStr); @@ -488,7 +366,7 @@ void Screen::print(const Common::Point &pt, byte color, const char *formatStr, . slamRect(textBounds); } -void Screen::gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) { +void Screen::gPrint(const Common::Point &pt, uint color, const char *formatStr, ...) { // Create the string to display va_list args; va_start(args, formatStr); @@ -499,7 +377,7 @@ void Screen::gPrint(const Common::Point &pt, byte color, const char *formatStr, writeString(str, pt, color); } -void Screen::writeString(const Common::String &str, const Common::Point &pt, byte overrideColor) { +void Screen::writeString(const Common::String &str, const Common::Point &pt, uint overrideColor) { Fonts::writeString(_backBuffer, str, pt, overrideColor); } diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h index 2e0cef72ca..04a0c1e505 100644 --- a/engines/sherlock/screen.h +++ b/engines/sherlock/screen.h @@ -35,22 +35,12 @@ namespace Sherlock { #define PALETTE_COUNT 256 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63) #define BG_GREYSCALE_RANGE_END 229 - -enum { - BLACK = 0, - INFO_BLACK = 1, - BORDER_COLOR = 237, - COMMAND_BACKGROUND = 4, - BUTTON_BACKGROUND = 235, - TALK_FOREGROUND = 12, - TALK_NULL = 16 -}; +#define BLACK 0 class SherlockEngine; class Screen : public Surface { private: - SherlockEngine *_vm; Common::List<Common::Rect> _dirtyRects; uint32 _transitionSeed; Surface _sceneSurface; @@ -69,6 +59,13 @@ private: */ bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2); protected: + SherlockEngine *_vm; + + /** + * Clear the current dirty rects list + */ + void clearDirtyRects() { _dirtyRects.clear(); } + /** * Adds a rectangle to the list of modified areas of the screen during the * current frame @@ -94,7 +91,7 @@ public: void update(); /** - * Makes the whole screen dirty, Hack for 3DO movie playing + * Makes the whole screen dirty */ void makeAllDirty(); @@ -134,22 +131,15 @@ public: void verticalTransition(); /** - * Fade backbuffer 1 into screen (3DO RGB!) - */ - void fadeIntoScreen3DO(int speed); - - void blitFrom3DOcolorLimit(uint16 color); - - /** * Prints the text passed onto the back buffer at the given position and color. * The string is then blitted to the screen */ - void print(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5); + void print(const Common::Point &pt, uint color, const char *formatStr, ...) GCC_PRINTF(4, 5); /** * Print a strings onto the back buffer without blitting it to the screen */ - void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5); + void gPrint(const Common::Point &pt, uint color, const char *formatStr, ...) GCC_PRINTF(4, 5); /** * Copies a section of the second back buffer into the main back buffer @@ -223,7 +213,7 @@ public: /** * Draws the given string into the back buffer using the images stored in _font */ - virtual void writeString(const Common::String &str, const Common::Point &pt, byte overrideColor); + virtual void writeString(const Common::String &str, const Common::Point &pt, uint overrideColor); // Rose Tattoo specific methods diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp index ae77c91009..3e3c579fdf 100644 --- a/engines/sherlock/sherlock.cpp +++ b/engines/sherlock/sherlock.cpp @@ -51,6 +51,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam _canLoadSave = false; _showOriginalSavesDialog = false; _interactiveFl = true; + _isScreenDoubled = false; } SherlockEngine::~SherlockEngine() { diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h index c05680eb08..b85321c385 100644 --- a/engines/sherlock/sherlock.h +++ b/engines/sherlock/sherlock.h @@ -80,6 +80,7 @@ class Resource; class SherlockEngine : public Engine { private: +\ /** * Main loop for displaying a scene and handling all that occurs within it */ @@ -133,6 +134,7 @@ public: bool _canLoadSave; bool _showOriginalSavesDialog; bool _interactiveFl; + bool _isScreenDoubled; public: SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc); virtual ~SherlockEngine(); diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp index b56692c704..d7d5cd95e8 100644 --- a/engines/sherlock/surface.cpp +++ b/engines/sherlock/surface.cpp @@ -201,33 +201,33 @@ void Surface::transBlitFromUnscaled(const Graphics::Surface &src, const Common:: } } -void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) { +void Surface::fillRect(int x1, int y1, int x2, int y2, uint color) { fillRect(Common::Rect(x1, y1, x2, y2), color); } -void Surface::fillRect(const Common::Rect &r, byte color) { +void Surface::fillRect(const Common::Rect &r, uint color) { _surface.fillRect(r, color); addDirtyRect(r); } -void Surface::fill(uint16 color) { - _surface.fillRect(Common::Rect(_surface.w, _surface.h), color); +void Surface::fill(uint color) { + fillRect(Common::Rect(_surface.w, _surface.h), color); } bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) { - if (destBounds.left >= _surface.w || destBounds.top >= _surface.h || + if (destBounds.left >= w() || destBounds.top >= h() || destBounds.right <= 0 || destBounds.bottom <= 0) return false; // Clip the bounds if necessary to fit on-screen - if (destBounds.right > _surface.w) { - srcBounds.right -= destBounds.right - _surface.w; - destBounds.right = _surface.w; + if (destBounds.right > w()) { + srcBounds.right -= destBounds.right - w(); + destBounds.right = w(); } - if (destBounds.bottom > _surface.h) { - srcBounds.bottom -= destBounds.bottom - _surface.h; - destBounds.bottom = _surface.h; + if (destBounds.bottom > h()) { + srcBounds.bottom -= destBounds.bottom - h(); + destBounds.bottom = h(); } if (destBounds.top < 0) { @@ -244,7 +244,7 @@ bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) { } void Surface::clear() { - fillRect(Common::Rect(0, 0, _surface.w, _surface.h), 0); + fillRect(Common::Rect(0, 0, w(), h()), 0); } void Surface::free() { @@ -262,11 +262,11 @@ void Surface::setPixels(byte *pixels, int width, int height, Graphics::PixelForm _surface.setPixels(pixels); } -void Surface::writeString(const Common::String &str, const Common::Point &pt, byte overrideColor) { +void Surface::writeString(const Common::String &str, const Common::Point &pt, uint overrideColor) { Fonts::writeString(this, str, pt, overrideColor); } -void Surface::writeFancyString(const Common::String &str, const Common::Point &pt, byte overrideColor1, byte overrideColor2) { +void Surface::writeFancyString(const Common::String &str, const Common::Point &pt, uint overrideColor1, uint overrideColor2) { writeString(str, Common::Point(pt.x, pt.y), overrideColor1); writeString(str, Common::Point(pt.x + 1, pt.y), overrideColor1); writeString(str, Common::Point(pt.x + 2, pt.y), overrideColor1); diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h index 385fb1793e..378c9be9cd 100644 --- a/engines/sherlock/surface.h +++ b/engines/sherlock/surface.h @@ -40,30 +40,32 @@ private: bool _freePixels; /** + * Copy a surface into this one + */ + void blitFrom(const Graphics::Surface &src); +protected: + Graphics::Surface _surface; + + /** * Clips the given source bounds so the passed destBounds will be entirely on-screen */ bool clip(Common::Rect &srcBounds, Common::Rect &destBounds); /** - * Copy a surface into this one + * Base method stub for signalling dirty rect areas */ - void blitFrom(const Graphics::Surface &src); + virtual void addDirtyRect(const Common::Rect &r) {} /** * Draws a sub-section of a surface at a given position within this surface */ - void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds); + virtual void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds); /** * Draws a surface at a given position within this surface with transparency */ - void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, + virtual void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, int overrideColor); - -protected: - Graphics::Surface _surface; - - virtual void addDirtyRect(const Common::Rect &r) {} public: Surface(uint16 width, uint16 height); Surface(); @@ -133,14 +135,14 @@ public: /** * Fill a given area of the surface with a given color */ - void fillRect(int x1, int y1, int x2, int y2, byte color); + void fillRect(int x1, int y1, int x2, int y2, uint color); /** * Fill a given area of the surface with a given color */ - void fillRect(const Common::Rect &r, byte color); + virtual void fillRect(const Common::Rect &r, uint color); - void fill(uint16 color); + void fill(uint color); /** * Clear the surface @@ -165,18 +167,18 @@ public: /** * Draws the given string into the back buffer using the images stored in _font */ - virtual void writeString(const Common::String &str, const Common::Point &pt, byte overrideColor); - void writeFancyString(const Common::String &str, const Common::Point &pt, byte overrideColor1, byte overrideColor2); + virtual void writeString(const Common::String &str, const Common::Point &pt, uint overrideColor); + void writeFancyString(const Common::String &str, const Common::Point &pt, uint overrideColor1, uint overrideColor2); - inline uint16 w() const { return _surface.w; } - inline uint16 h() const { return _surface.h; } + inline virtual uint16 w() const { return _surface.w; } + inline virtual uint16 h() const { return _surface.h; } inline const byte *getPixels() const { return (const byte *)_surface.getPixels(); } inline byte *getPixels() { return (byte *)_surface.getPixels(); } inline byte *getBasePtr(int x, int y) { return (byte *)_surface.getBasePtr(x, y); } inline const byte *getBasePtr(int x, int y) const { return (const byte *)_surface.getBasePtr(x, y); } inline Graphics::Surface &getRawSurface() { return _surface; } - inline void hLine(int x, int y, int x2, uint32 color) { _surface.hLine(x, y, x2, color); } - inline void vLine(int x, int y, int y2, uint32 color) { _surface.vLine(x, y, y2, color); } + inline void hLine(int x, int y, int x2, uint color) { _surface.hLine(x, y, x2, color); } + inline void vLine(int x, int y, int y2, uint color) { _surface.vLine(x, y, y2, color); } }; } // End of namespace Sherlock diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 010bb3dab8..950905084b 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -127,7 +127,7 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) { _talkHistory.resize(IS_ROSE_TATTOO ? 1500 : 500); } -void Talk::talkTo(const Common::String &filename) { +void Talk::talkTo(const Common::String filename) { Events &events = *_vm->_events; Inventory &inv = *_vm->_inventory; Journal &journal = *_vm->_journal; @@ -399,7 +399,6 @@ void Talk::talkTo(const Common::String &filename) { if (_talkTo != -1 && !_talkHistory[_converseNum][select]) journal.record(_converseNum, select, true); _talkHistory[_converseNum][select] = true; - } ui._key = ui._oldKey = Scalpel::COMMANDS[TALK_MODE - 1]; @@ -440,12 +439,6 @@ void Talk::talkTo(const Common::String &filename) { // previous script can continue popStack(); - if (IS_SERRATED_SCALPEL && filename == "Tube59c") { - // WORKAROUND: Original game bug causes the results of testing the powdery substance - // to disappear too quickly. Introduce a delay to allow it to be properly displayed - ui._menuCounter = 30; - } - events.setCursor(ARROW); } @@ -576,8 +569,6 @@ void Talk::loadTalkFile(const Common::String &filename) { // Create the base of the sound filename used for talking in Rose Tattoo if (IS_ROSE_TATTOO && _scriptMoreFlag != 1) sound._talkSoundFile = Common::String(filename.c_str(), filename.c_str() + 7) + "."; - else if (IS_3DO) - _3doSpeechIndex = 1; // Open the talk file for reading Common::SeekableReadStream *talkStream = res.load(talkFile); @@ -677,6 +668,7 @@ void Talk::doScript(const Common::String &script) { Tattoo::TattooPerson &p = (*(Tattoo::TattooPeople *)_vm->_people)[idx]; p._savedNpcSequence = p._sequenceNumber; p._savedNpcFrame = p._frameNumber; + p._resetNPCPath = true; } } @@ -1054,6 +1046,8 @@ OpcodeReturn Talk::cmdPauseWithoutControl(const byte *&str) { Scene &scene = *_vm->_scene; ++str; + events.incWaitCounter(); + for (int idx = 0; idx < (str[0] - 1); ++idx) { scene.doBgAnim(); if (_talkToAbort) @@ -1064,6 +1058,8 @@ OpcodeReturn Talk::cmdPauseWithoutControl(const byte *&str) { events.setButtonState(); } + events.decWaitCounter(); + _endStr = false; return RET_SUCCESS; } @@ -1091,7 +1087,9 @@ OpcodeReturn Talk::cmdRunCAnimation(const byte *&str) { return RET_EXIT; // Check if next character is changing side or changing portrait - if (_charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION])) + _wait = 0; + if (_charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || + (IS_SERRATED_SCALPEL && str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]))) _wait = 1; return RET_SUCCESS; diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h index 694ac083b2..f354c28c1b 100644 --- a/engines/sherlock/talk.h +++ b/engines/sherlock/talk.h @@ -228,7 +228,7 @@ protected: * When the talk window has been displayed, waits a period of time proportional to * the amount of text that's been displayed */ - int waitForMore(int delay); + virtual int waitForMore(int delay); /** * Display the talk interface window @@ -283,7 +283,7 @@ public: * In their case, the conversation display is simply suppressed, and control is passed on to * doScript to implement whatever action is required. */ - void talkTo(const Common::String &filename); + virtual void talkTo(const Common::String filename); /** * Parses a reply for control codes and display text. The found text is printed within @@ -308,7 +308,7 @@ public: * Opens the talk file 'talk.tlk' and searches the index for the specified * conversation. If found, the data for that conversation is loaded */ - void loadTalkFile(const Common::String &filename); + virtual void loadTalkFile(const Common::String &filename); /** * Push the sequence of a background object that's an NPC that needs to be diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp index cb4b52b01a..6d6c74dcf6 100644 --- a/engines/sherlock/tattoo/tattoo_darts.cpp +++ b/engines/sherlock/tattoo/tattoo_darts.cpp @@ -77,7 +77,6 @@ void Darts::playDarts(GameType gameType) { Screen &screen = *_vm->_screen; int oldFontType = screen.fontNumber(); int playerNum = 0; - int roundStart, score; int lastDart; int numHits = 0; bool gameOver = false; @@ -92,6 +91,7 @@ void Darts::playDarts(GameType gameType) { initDarts(); while (!done && !_vm->shouldQuit()) { + int roundStart, score; roundStart = score = (playerNum == 0) ? _score1 : _score2; showNames(playerNum); @@ -143,7 +143,6 @@ void Darts::playDarts(GameType gameType) { } else { // check for cricket game over bool allClosed = true; - int nOtherScore; for (int y = 0; y < 7; y++) { if (_cricketScore[playerNum][y] < 3) @@ -151,7 +150,7 @@ void Darts::playDarts(GameType gameType) { } if (allClosed) { - nOtherScore = (playerNum == 0) ? _score2 : _score1; + int nOtherScore = (playerNum == 0) ? _score2 : _score1; if (score >= nOtherScore) gameOver = true; } @@ -561,11 +560,10 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) { Events &events = *_vm->_events; Screen &screen = *_vm->_screen; int cx, cy; - int handCy; int drawX = 0, drawY = 0, oldDrawX = 0, oldDrawY = 0; int xSize = 0, ySize = 0, oldxSize = 0, oldySize = 0; - int handOCx, handOCy; - int ocx, ocy; + int handOCx = 0, handOCy = 0; + int ocx = 0, ocy = 0; int handOldxSize, handOldySize; int delta = 9; int dartNum; @@ -576,7 +574,6 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) { ImageFile &hands = !computer ? *_hand1 : *_hand2; int numFrames = !computer ? 14 : 13; - ocx = ocy = handOCx = handOCy = 0; oldxSize = oldySize = handOldxSize = handOldySize = 1; cx = dartPos.x; cy = SHERLOCK_SCREEN_HEIGHT - _handSize.y - 20; @@ -590,7 +587,7 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) { for (int idx = 0; idx < numFrames; ++idx) { _handSize.x = hands[idx]._offset.x + hands[idx]._width; _handSize.y = hands[idx]._offset.y + hands[idx]._height; - handCy = SHERLOCK_SCREEN_HEIGHT - _handSize.y; + int handCy = SHERLOCK_SCREEN_HEIGHT - _handSize.y; screen._backBuffer1.transBlitFrom(hands[idx], Common::Point(_handX, handCy)); screen.slamArea(_handX, handCy, _handSize.x + 1, _handSize.y); @@ -787,8 +784,6 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) { int score; int aim = 0; Common::Point pt; - bool done = false; - int cricketaimset = false; bool shootBull = false; score = (playerNum == 0) ? _score1 : _score2; @@ -799,6 +794,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) { if(score > 60) shootBull = true; } else { + bool cricketaimset = false; if (_cricketScore[playerNum][6] < 3) { // shoot at bull first aim = CRICKET_VALUE[6]; @@ -842,6 +838,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) { } } else { // Loop in case number does not exist on board + bool done = false; do { done = findNumberOnBoard(aim, pt); --aim; diff --git a/engines/sherlock/tattoo/tattoo_inventory.cpp b/engines/sherlock/tattoo/tattoo_inventory.cpp index 6bd1822c10..14e79e9f33 100644 --- a/engines/sherlock/tattoo/tattoo_inventory.cpp +++ b/engines/sherlock/tattoo/tattoo_inventory.cpp @@ -43,10 +43,10 @@ void TattooInventory::loadInv() { Common::SeekableReadStream *stream = _vm->_res->load("invent.txt"); int count = stream->readByte(); - char c; for (int idx = 0; idx < count; ++idx) { Common::String name; + char c; while ((c = stream->readByte()) != 0) name += c; diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp index 29b40096cb..abe3e5420e 100644 --- a/engines/sherlock/tattoo/tattoo_journal.cpp +++ b/engines/sherlock/tattoo/tattoo_journal.cpp @@ -345,16 +345,16 @@ void TattooJournal::handleButtons() { disableControls(); bool notFound = false; - int dir; do { + int dir; if ((dir = getFindName(notFound)) != 0) { _savedIndex = _index; _savedSub = _sub; _savedPage = _page; - if (drawJournal(dir + 2, 1000 * LINES_PER_PAGE) == 0) - { + bool drawResult = drawJournal(dir + 2, 1000 * LINES_PER_PAGE); + if (!drawResult) { _index = _savedIndex; _sub = _savedSub; _page = _savedPage; @@ -362,12 +362,13 @@ void TattooJournal::handleButtons() { drawFrame(); drawJournal(0, 0); notFound = true; - } else { - break; } highlightJournalControls(false); screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT); + + if (drawResult) + break; } else { break; } @@ -729,7 +730,7 @@ void TattooJournal::drawScrollBar() { void TattooJournal::disableControls() { Screen &screen = *_vm->_screen; Common::Rect r(JOURNAL_BAR_WIDTH, BUTTON_SIZE + screen.fontHeight() + 13); - r.moveTo((SHERLOCK_SCREEN_HEIGHT - r.width()) / 2, SHERLOCK_SCREEN_HEIGHT - r.height()); + r.moveTo((SHERLOCK_SCREEN_WIDTH - r.width()) / 2, SHERLOCK_SCREEN_HEIGHT - r.height()); const char *JOURNAL_COMMANDS[3] = { FIXED(CloseJournal), FIXED(SearchJournal), FIXED(SaveJournal) }; // Print the Journal commands @@ -752,7 +753,9 @@ int TattooJournal::getFindName(bool printError) { int done = 0; Common::String name; int cursorX, cursorY; - bool flag = false; + bool blinkFlag = false; + int blinkCountdown = 1; + enum SearchButtons { SB_CANCEL = 0, SB_BACKWARDS = 1, SB_FORWARDS = 2 }; Common::Rect r(JOURNAL_BAR_WIDTH, (screen.fontHeight() + 4) * 2 + 9); r.moveTo((SHERLOCK_SCREEN_WIDTH - r.width()) / 2, (SHERLOCK_SCREEN_HEIGHT - r.height()) / 2); @@ -761,6 +764,7 @@ int TattooJournal::getFindName(bool printError) { cursorY = r.top + screen.fontHeight() + 12; drawControls(1); + disableControls(); // Backup the area under the text entry Surface bgSurface(r.width() - 6, screen.fontHeight()); @@ -768,7 +772,8 @@ int TattooJournal::getFindName(bool printError) { r.right - 3, cursorY + screen.fontHeight())); if (printError) { - screen.gPrint(Common::Point(0, cursorY), INFO_TOP, "%s", FIXED(TextNotFound)); + screen.gPrint(Common::Point(r.left + (r.width() - screen.stringWidth(FIXED(TextNotFound))) / 2, cursorY), + INFO_TOP, "%s", FIXED(TextNotFound)); } else { // If there was a name already entered, copy it to name and display it if (!_find.empty()) { @@ -820,21 +825,27 @@ int TattooJournal::getFindName(bool printError) { events.setButtonState(); // Handle blinking cursor - flag = !flag; - if (flag) { - // Draw cursor - screen._backBuffer1.fillRect(Common::Rect(cursorX, cursorY, cursorX + 7, cursorY + 8), COMMAND_HIGHLIGHTED); - screen.slamArea(cursorX, cursorY, 8, 9); - } else { - // Erase cursor by restoring background and writing current text - screen._backBuffer1.blitFrom(bgSurface, Common::Point(r.left + 3, cursorY)); - screen.gPrint(Common::Point(r.left + screen.widestChar() + 3, cursorY), COMMAND_HIGHLIGHTED, "%s", name.c_str()); - screen.slamArea(r.left + 3, r.top, r.width() - 3, screen.fontHeight()); + if (--blinkCountdown == 0) { + blinkCountdown = 3; + blinkFlag = !blinkFlag; + if (blinkFlag) { + // Draw cursor + screen._backBuffer1.fillRect(Common::Rect(cursorX, cursorY, cursorX + 7, cursorY + 8), COMMAND_HIGHLIGHTED); + screen.slamArea(cursorX, cursorY, 8, 9); + } + else { + // Erase cursor by restoring background and writing current text + screen._backBuffer1.blitFrom(bgSurface, Common::Point(r.left + 3, cursorY)); + screen.gPrint(Common::Point(r.left + screen.widestChar() + 3, cursorY), COMMAND_HIGHLIGHTED, "%s", name.c_str()); + screen.slamArea(r.left + 3, cursorY, r.width() - 3, screen.fontHeight()); + } } highlightSearchControls(true); events.wait(2); + if (_vm->shouldQuit()) + return 0; } if (events.kbHit()) { @@ -881,10 +892,11 @@ int TattooJournal::getFindName(bool printError) { } } - if (keyState.ascii && keyState.ascii != '@' && name.size() < 50) { + if (keyState.ascii >= ' ' && keyState.ascii != '@' && name.size() < 50) { if ((cursorX + screen.charWidth(keyState.ascii)) < (r.right - screen.widestChar() * 3)) { - cursorX += screen.charWidth(keyState.ascii); - name += toupper(keyState.ascii); + char c = toupper(keyState.ascii); + cursorX += screen.charWidth(c); + name += c; } } @@ -897,13 +909,13 @@ int TattooJournal::getFindName(bool printError) { if (events._released || events._rightReleased) { switch (_selector) { - case JH_CLOSE: + case (int)SB_CANCEL: done = -1; break; - case JH_SEARCH: + case (int)SB_BACKWARDS: done = 2; break; - case JH_PRINT: + case (int)SB_FORWARDS: done = 1; break; default: @@ -913,6 +925,7 @@ int TattooJournal::getFindName(bool printError) { } while (!done); if (done != -1) { + // Forwards or backwards search, so save the entered name _find = name; result = done; } else { diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp index 95858aef26..4bd85bd5c0 100644 --- a/engines/sherlock/tattoo/tattoo_map.cpp +++ b/engines/sherlock/tattoo/tattoo_map.cpp @@ -69,7 +69,7 @@ int TattooMap::show() { } } - if (music._midiOption) { + if (music._musicOn) { // See if Holmes or Watson is the active character Common::String song; if (_vm->readFlags(FLAG_PLAYER_IS_HOLMES)) @@ -81,8 +81,7 @@ int TattooMap::show() { song = "Cue7"; if (music.loadSong(song)) { - if (music._musicOn) - music.startSong(); + music.startSong(); } } @@ -427,7 +426,7 @@ void TattooMap::showCloseUp(int closeUpNum) { screen._backBuffer1.transBlitFrom(pic[0], Common::Point(r.left, r.top)); screen.slamRect(oldBounds); screen.slamRect(r); - events.wait(2); + events.wait(60); } } // End of namespace Tattoo diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index 5cb6c4cfbb..fe60189965 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -486,8 +486,8 @@ void TattooPerson::setWalking() { } // See if the new walk sequence is the same as the old. If it's a new one, - // we need to reset the frame number to zero so it's animation starts at - // it's beginning. Otherwise, if it's the same sequence, we can leave it + // we need to reset the frame number to zero so its animation starts at + // its beginning. Otherwise, if it's the same sequence, we can leave it // as is, so it keeps the animation going at wherever it was up to if (_sequenceNumber != _oldWalkSequence) { if (_seqTo) { @@ -995,6 +995,8 @@ void TattooPerson::synchronize(Serializer &s) { s.syncAsSint32LE(_npcPause); s.syncAsByte(_lookHolmes); s.syncAsByte(_updateNPCPath); + if (s.isLoading()) + _npcIndex = 0; // Verbs for (int idx = 0; idx < 2; ++idx) @@ -1008,7 +1010,6 @@ void TattooPerson::walkHolmesToNPC() { Screen &screen = *_vm->_screen; Talk &talk = *_vm->_talk; TattooPerson &holmes = people[HOLMES]; - int facing; // Save the character's details pushNPCPath(); @@ -1071,9 +1072,8 @@ void TattooPerson::walkHolmesToNPC() { if (!talk._talkToAbort) { // Setup correct direction for Holmes to face - // See where Holmes is with respect to the NPC (x coords) - facing = (holmes._position.x < _position.x) ? STOP_RIGHT : STOP_LEFT; + int facing = (holmes._position.x < _position.x) ? STOP_RIGHT : STOP_LEFT; // See where Holmes is with respect to the NPC (y coords) if (holmes._position.y < (_position.y - (10 * FIXED_INT_MULTIPLIER))) { @@ -1281,8 +1281,7 @@ void TattooPeople::setTalkSequence(int speaker, int sequenceNum) { if (obj.hasAborts()) { talk.pushSequenceEntry(&obj); obj._gotoSeq = sequenceNum; - } - else { + } else { obj.setObjTalkSequence(sequenceNum); } } else if (objNum != -1) { @@ -1486,7 +1485,7 @@ const Common::Point TattooPeople::restrictToZone(int zoneId, const Common::Point else if (destPos.x < r.left && r.top < destPos.y && destPos.y < r.bottom) return Common::Point(r.left, destPos.y); else if (destPos.x > r.right && r.top < destPos.y && destPos.y < r.bottom) - return Common::Point(r.bottom, destPos.y); + return Common::Point(r.right, destPos.y); // Find which corner of the zone the point is closet to if (destPos.x <= r.left) { diff --git a/engines/sherlock/tattoo/tattoo_people.h b/engines/sherlock/tattoo/tattoo_people.h index 66123a7f72..722c4a9aaa 100644 --- a/engines/sherlock/tattoo/tattoo_people.h +++ b/engines/sherlock/tattoo/tattoo_people.h @@ -188,7 +188,7 @@ public: void walkBothToCoords(const PositionFacing &holmesDest, const PositionFacing &npcDest); /** - * This adjusts the sprites position, as well as it's animation sequence: + * This adjusts the sprites position, as well as its animation sequence: */ virtual void adjustSprite(); diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp index f13d0588df..816220361b 100644 --- a/engines/sherlock/tattoo/tattoo_scene.cpp +++ b/engines/sherlock/tattoo/tattoo_scene.cpp @@ -809,13 +809,12 @@ void TattooScene::synchronize(Serializer &s) { int TattooScene::closestZone(const Common::Point &pt) { int zone = -1; int dist = 9999; - int d; for (uint idx = 0; idx < _zones.size(); ++idx) { Common::Rect &r = _zones[idx]; // Check the distance from the point to the center of the zone - d = ABS(r.left + (r.width() / 2) - pt.x) + ABS(r.top + (r.height() / 2) - pt.y); + int d = ABS(r.left + (r.width() / 2) - pt.x) + ABS(r.top + (r.height() / 2) - pt.y); if (d < dist) { dist = d; zone = idx; diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index a341115137..a4ceca042b 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -183,6 +183,25 @@ TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm), _talkWidget(vm), _passwor _opcodeTable = OPCODE_METHODS; } +void TattooTalk::talkTo(const Common::String filename) { + Events &events = *_vm->_events; + TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui; + + // WORKAROUND: Keep wait cursor active until very end of the cutscene of the monkey + // stealing the cap, which is finished by calling the 30cuend script + if (filename == "wilb29a") + events.incWaitCounter(); + + Talk::talkTo(filename); + + if (filename == "wilb29a") + ui._menuMode = TALK_MODE; + if (filename == "30cuend") { + events.decWaitCounter(); + events.setCursor(ARROW); + } +} + void TattooTalk::talkInterface(const byte *&str) { TattooEngine &vm = *(TattooEngine *)_vm; Sound &sound = *_vm->_sound; @@ -621,7 +640,7 @@ OpcodeReturn TattooTalk::cmdSetNPCTalkFile(const byte *&str) { memset(person._npcPath, 0, 100); } - person._npcPath[person._npcIndex] = 3; + person._npcPath[person._npcIndex] = NPCPATH_SET_TALK_FILE; for (int i = 1; i <= 8; i++) person._npcPath[person._npcIndex + i] = str[i]; diff --git a/engines/sherlock/tattoo/tattoo_talk.h b/engines/sherlock/tattoo/tattoo_talk.h index d2ddda08a8..9b010513dc 100644 --- a/engines/sherlock/tattoo/tattoo_talk.h +++ b/engines/sherlock/tattoo/tattoo_talk.h @@ -103,6 +103,16 @@ protected: public: TattooTalk(SherlockEngine *vm); virtual ~TattooTalk() {} + + /** + * Called whenever a conversation or item script needs to be run. For standard conversations, + * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly + * instead of waiting for a statement option. + * @remarks It seems that at some point, all item scripts were set up to use this as well. + * In their case, the conversation display is simply suppressed, and control is passed on to + * doScript to implement whatever action is required. + */ + virtual void talkTo(const Common::String filename); /** * Push the details of a passed object onto the saved sequences stack diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index a3742109e8..da4a277ba3 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -85,7 +85,6 @@ void TattooUserInterface::lookAtObject() { Talk &talk = *_vm->_talk; Common::Point mousePos = events.mousePos(); Common::String desc; - int cAnimSpeed = 0; _lookPos = mousePos; _menuMode = LOOK_MODE; @@ -95,7 +94,7 @@ void TattooUserInterface::lookAtObject() { } else { // Check if there is a Look animation if (_bgShape->_lookcAnim != 0) { - cAnimSpeed = _bgShape->_lookcAnim & 0xe0; + int cAnimSpeed = _bgShape->_lookcAnim & 0xe0; cAnimSpeed >>= 5; ++cAnimSpeed; @@ -216,9 +215,9 @@ void TattooUserInterface::doJournal() { TattooJournal &journal = *(TattooJournal *)_vm->_journal; TattooScene &scene = *(TattooScene *)_vm->_scene; Screen &screen = *_vm->_screen; - byte lookupTable[PALETTE_SIZE]; + byte lookupTable[PALETTE_COUNT]; - Common::copy(&_lookupTable[0], &_lookupTable[PALETTE_SIZE], &lookupTable[0]); + Common::copy(&_lookupTable[0], &_lookupTable[PALETTE_COUNT], &lookupTable[0]); _menuMode = JOURNAL_MODE; journal.show(); @@ -229,7 +228,7 @@ void TattooUserInterface::doJournal() { // Restore the the old screen palette and greyscale lookup table screen.clear(); screen.setPalette(screen._cMap); - Common::copy(&lookupTable[0], &lookupTable[PALETTE_SIZE], &_lookupTable[0]); + Common::copy(&lookupTable[0], &lookupTable[PALETTE_COUNT], &_lookupTable[0]); // Restore the scene screen._backBuffer1.blitFrom(screen._backBuffer2); @@ -270,17 +269,18 @@ void TattooUserInterface::handleInput() { if (events.kbHit()) { _keyState = events.getKey(); - if (_keyState.keycode == Common::KEYCODE_s && vm._allowFastMode) - vm._fastMode = !vm._fastMode; - - else if (_keyState.keycode == Common::KEYCODE_l && _bgFound != -1) { - // Beging used for testing that Look dialogs work - lookAtObject(); - - } else if (_keyState.keycode == Common::KEYCODE_ESCAPE && vm._runningProlog && !_lockoutTimer) { + if (_keyState.keycode == Common::KEYCODE_ESCAPE && vm._runningProlog && !_lockoutTimer) { vm.setFlags(-76); vm.setFlags(396); scene._goToScene = STARTING_GAME_SCENE; + } else if (_menuMode == STD_MODE) { + if (_keyState.keycode == Common::KEYCODE_s && vm._allowFastMode) { + vm._fastMode = !vm._fastMode; + + } else if (_keyState.keycode == Common::KEYCODE_l && _bgFound != -1) { + // Beging used for testing that Look dialogs work + lookAtObject(); + } } } @@ -342,7 +342,7 @@ void TattooUserInterface::doBgAnimRestoreUI() { if (scene._activeCAnim.active()) screen.restoreBackground(scene._activeCAnim._oldBounds); - // If a canimation just ended, remove it's graphics from the backbuffer + // If a canimation just ended, remove its graphics from the backbuffer if (scene._activeCAnim._removeBounds.width() > 0) screen.restoreBackground(scene._activeCAnim._removeBounds); } @@ -376,7 +376,6 @@ void TattooUserInterface::doStandardControl() { TattooScene &scene = *(TattooScene *)_vm->_scene; Talk &talk = *_vm->_talk; Common::Point mousePos = events.mousePos(); - bool noDesc = false; // Don't do any input processing whilst the prolog is running if (vm._runningProlog) @@ -457,6 +456,7 @@ void TattooUserInterface::doStandardControl() { if (_arrowZone == -1 || events._rightReleased) freeMenu(); + bool noDesc = false; if (_personFound) { if (people[_bgFound - 1000]._description.empty() || people[_bgFound - 1000]._description.hasPrefix(" ")) noDesc = true; @@ -481,7 +481,7 @@ void TattooUserInterface::doStandardControl() { talk.initTalk(_bgFound); _activeObj = -1; } else if (!noDesc) { - // Either call the code to Look at it's Examine Field or call the Exit animation + // Either call the code to Look at its Examine Field or call the Exit animation // if the object is an exit, specified by the first four characters of the name being "EXIT" Common::String name = _personFound ? people[_bgFound - 1000]._name : _bgShape->_name; if (!name.hasPrefix("EXIT")) { diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp index 606c8210b0..0f5e6793c4 100644 --- a/engines/sherlock/tattoo/widget_files.cpp +++ b/engines/sherlock/tattoo/widget_files.cpp @@ -58,7 +58,7 @@ void WidgetFiles::show(SaveMode mode) { (FILES_LINES_COUNT + 1) + 17); _bounds.moveTo(mousePos.x - _bounds.width() / 2, mousePos.y - _bounds.height() / 2); - // Create the surface and render it's contents + // Create the surface and render its contents _surface.create(_bounds.width(), _bounds.height()); render(RENDER_ALL); @@ -253,7 +253,6 @@ bool WidgetFiles::getFilename() { int done = 0; bool blinkFlag = false; int blinkCountdown = 0; - int width; int cursorColor = 192; byte color, textColor; bool insert = true; @@ -285,7 +284,7 @@ bool WidgetFiles::getFilename() { char currentChar = (index == (int)filename.size()) ? ' ' : filename[index]; Common::String charString = Common::String::format("%c", currentChar); - width = screen.charWidth(currentChar); + int width = screen.charWidth(currentChar); // Wait for keypress while (!events.kbHit()) { diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index 20881ef012..3555ecdffd 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -41,7 +41,7 @@ WidgetInventoryTooltip::WidgetInventoryTooltip(SherlockEngine *vm, WidgetInvento } void WidgetInventoryTooltip::setText(const Common::String &str) { - // If no text specified, erase any previously displayed tooltip and free it's surface + // If no text specified, erase any previously displayed tooltip and free its surface if (str.empty()) { erase(); _surface.free(); diff --git a/engines/sherlock/tattoo/widget_lab.cpp b/engines/sherlock/tattoo/widget_lab.cpp index 2873b12f22..eb32e2e22c 100644 --- a/engines/sherlock/tattoo/widget_lab.cpp +++ b/engines/sherlock/tattoo/widget_lab.cpp @@ -45,7 +45,6 @@ void WidgetLab::handleEvents() { Common::Point mousePos = events.mousePos(); WidgetBase::handleEvents(); - bool noDesc = false; // Handle drawing tooltips. If the user is dragging a lab item, display a tooltip for using the item // on another. Otherwise, fall back on showing standard tooltips @@ -65,6 +64,7 @@ void WidgetLab::handleEvents() { if (ui._arrowZone == -1 || events._rightReleased) ui._tooltipWidget.setText(""); + bool noDesc = false; if (ui._bgFound != -1) { if (ui._bgShape->_description.hasPrefix(" ") || ui._bgShape->_description.empty()) noDesc = true; diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp index b0cc7bcfb2..6e7bde292f 100644 --- a/engines/sherlock/tattoo/widget_talk.cpp +++ b/engines/sherlock/tattoo/widget_talk.cpp @@ -303,7 +303,7 @@ void WidgetTalk::handleEvents() { int select = -1; _selector = _oldSelector = -1; - // Find the first statement that has all it's flags set correctly + // Find the first statement that has all its flags set correctly for (uint idx = 0; idx < talk._statements.size() && select == -1; ++select) { if (!talk._statements[idx]._talkMap) select = idx; @@ -347,6 +347,7 @@ void WidgetTalk::handleEvents() { if (ui._menuMode != PASSWORD_MODE) { ui.banishWindow(); ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE; + events.setCursor(ARROW); } break; } @@ -368,11 +369,11 @@ void WidgetTalk::handleEvents() { void WidgetTalk::render(Highlight highlightMode) { TattooTalk &talk = *(TattooTalk *)_vm->_talk; - int yp = 5; - int statementNum = 1; - byte color; if (highlightMode != HL_SCROLLBAR_ONLY) { + int yp = 5; + int statementNum = 1; + // Draw all the statements // Check whether scrolling has occurred, and if so, figure out what the starting // number for the first visible statement will be @@ -391,7 +392,7 @@ void WidgetTalk::render(Highlight highlightMode) { _surface.fillRect(Common::Rect(3, yp, _surface.w() - BUTTON_SIZE - 3, yp + _surface.fontHeight()), TRANSPARENCY); // Different coloring based on whether the option has been previously chosen or not - color = (!talk._talkHistory[talk._converseNum][_statementLines[idx]._num]) ? + byte color = (!talk._talkHistory[talk._converseNum][_statementLines[idx]._num]) ? INFO_TOP : INFO_BOTTOM; if (_statementLines[idx]._num == _selector && highlightMode == HL_CHANGED_HIGHLIGHTS) @@ -441,7 +442,7 @@ void WidgetTalk::setStatementLines() { _statementLines.clear(); for (uint statementNum = 0; statementNum < talk._statements.size(); ++statementNum) { - // See if this statment meets all of it's flag requirements + // See if this statment meets all of its flag requirements if (talk._statements[statementNum]._talkMap != -1) { // Get the next statement text to process Common::String str = talk._statements[statementNum]._statement; diff --git a/engines/sherlock/tattoo/widget_text.cpp b/engines/sherlock/tattoo/widget_text.cpp index 33330df2e2..86aa067301 100644 --- a/engines/sherlock/tattoo/widget_text.cpp +++ b/engines/sherlock/tattoo/widget_text.cpp @@ -100,6 +100,11 @@ void WidgetText::centerWindowOnSpeaker(int speaker) { // Check each NPC to see if they are the one that is talking for (int idx = 1; idx < MAX_CHARACTERS; ++idx) { + // WORKAROUND: Fixes an original game bug where the positioning for Watson's dialogs + // during conversations at the Park Lake lake scene is in the incorrect position + if (speaker == 1 && scene._currentScene == 30) + continue; + if (people[idx]._type == CHARACTER) { if (!scumm_strnicmp(people[idx]._npcName.c_str(), people._characters[speaker]._portrait, 4)) { // Place the window above the player diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp index 0b523a93e9..09d2795a7b 100644 --- a/engines/sherlock/tattoo/widget_verbs.cpp +++ b/engines/sherlock/tattoo/widget_verbs.cpp @@ -158,7 +158,6 @@ void WidgetVerbs::handleEvents() { Talk &talk = *_vm->_talk; TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui; Common::Point mousePos = events.mousePos(); - bool noDesc = false; Common::String strLook = fixedText.getText(kFixedText_Look); Common::String strTalk = fixedText.getText(kFixedText_Talk); @@ -184,6 +183,7 @@ void WidgetVerbs::handleEvents() { ui._personFound = ui._bgFound >= 1000; ui._bgShape = ui._personFound || ui._bgFound == -1 ? nullptr : &scene._bgShapes[ui._bgFound]; + bool noDesc = false; if (ui._personFound) { if (people[ui._bgFound - 1000]._description.empty() || people[ui._bgFound - 1000]._description.hasPrefix(" ")) noDesc = true; diff --git a/engines/zvision/POTFILES b/engines/zvision/POTFILES index 48e2782648..61cf42ded2 100644 --- a/engines/zvision/POTFILES +++ b/engines/zvision/POTFILES @@ -1 +1 @@ -engines/zvision/detection.cpp +engines/zvision/detection_tables.h diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp index cf8505ec82..1d23546551 100644 --- a/engines/zvision/video/zork_avi_decoder.cpp +++ b/engines/zvision/video/zork_avi_decoder.cpp @@ -34,44 +34,43 @@ namespace ZVision { Video::AVIDecoder::AVIAudioTrack *ZorkAVIDecoder::createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo) { - ZorkAVIDecoder::ZorkAVIAudioTrack *audioTrack = new ZorkAVIDecoder::ZorkAVIAudioTrack(sHeader, wvInfo, _soundType); - return (Video::AVIDecoder::AVIAudioTrack *)audioTrack; + if (wvInfo.tag != kWaveFormatZorkPCM) + return new AVIAudioTrack(sHeader, wvInfo, _soundType); + + assert(wvInfo.size == 8); + return new ZorkAVIAudioTrack(sHeader, wvInfo, _soundType); +} + +ZorkAVIDecoder::ZorkAVIAudioTrack::ZorkAVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType) : + Video::AVIDecoder::AVIAudioTrack(streamHeader, waveFormat, soundType), _queueStream(0), _decoder(waveFormat.channels == 2) { } -void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *stream) { - bool updateCurChunk = true; - if (_audStream) { - if (_wvInfo.tag == kWaveFormatZorkPCM) { - assert(_wvInfo.size == 8); - RawChunkStream::RawChunk chunk = decoder->readNextChunk(stream); - delete stream; +void ZorkAVIDecoder::ZorkAVIAudioTrack::createAudioStream() { + _queueStream = Audio::makeQueuingAudioStream(_wvInfo.samplesPerSec, _wvInfo.channels == 2); + _audioStream = _queueStream; +} + +void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *stream) { + RawChunkStream::RawChunk chunk = _decoder.readNextChunk(stream); + delete stream; - if (chunk.data) { - byte flags = Audio::FLAG_16BITS | Audio::FLAG_STEREO; + if (chunk.data) { + byte flags = Audio::FLAG_16BITS; + if (_wvInfo.channels == 2) + flags |= Audio::FLAG_STEREO; #ifdef SCUMM_LITTLE_ENDIAN - // RawChunkStream produces native endianness int16 - flags |= Audio::FLAG_LITTLE_ENDIAN; + // RawChunkStream produces native endianness int16 + flags |= Audio::FLAG_LITTLE_ENDIAN; #endif - _audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, flags); - } - } else { - updateCurChunk = false; - AVIAudioTrack::queueSound(stream); - } - } else { - delete stream; + _queueStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, flags); } - // The superclass always updates _curChunk, whether or not audio has - // been queued, so we should do that too. Unless the superclass already - // has done it for us. - if (updateCurChunk) { - _curChunk++; - } + _curChunk++; } void ZorkAVIDecoder::ZorkAVIAudioTrack::resetStream() { - decoder->init(); + AVIAudioTrack::resetStream(); + _decoder.init(); } } // End of namespace ZVision diff --git a/engines/zvision/video/zork_avi_decoder.h b/engines/zvision/video/zork_avi_decoder.h index 89c0d1e4b9..afcdb05676 100644 --- a/engines/zvision/video/zork_avi_decoder.h +++ b/engines/zvision/video/zork_avi_decoder.h @@ -39,22 +39,15 @@ public: private: class ZorkAVIAudioTrack : public Video::AVIDecoder::AVIAudioTrack { public: - ZorkAVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType) : - Video::AVIDecoder::AVIAudioTrack(streamHeader, waveFormat, soundType), - decoder(NULL) { - if (_audStream) { - decoder = new RawChunkStream(_audStream->isStereo()); - } - } - virtual ~ZorkAVIAudioTrack() { - if (decoder) - delete decoder; - } + ZorkAVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType); + void createAudioStream(); void queueSound(Common::SeekableReadStream *stream); void resetStream(); + private: - RawChunkStream *decoder; + Audio::QueuingAudioStream *_queueStream; + RawChunkStream _decoder; }; Video::AVIDecoder::AVIAudioTrack *createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo); diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 466681e89d..c9b435963d 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -87,6 +87,19 @@ Debugger::~Debugger() { // Initialisation Functions +int Debugger::getCharsPerLine() { +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER + const int charsPerLine = _debuggerDialog->getCharsPerLine(); +#elif defined(USE_READLINE) + int charsPerLine, rows; + rl_get_screen_size(&rows, &charsPerLine); +#else + // Can we do better? + const int charsPerLine = 80; +#endif + return charsPerLine; +} + int Debugger::debugPrintf(const char *format, ...) { va_list argptr; @@ -101,6 +114,37 @@ int Debugger::debugPrintf(const char *format, ...) { return count; } +void Debugger::debugPrintColumns(const Common::StringArray &list) { + uint maxLength = 0; + uint i, j; + + for (i = 0; i < list.size(); i++) { + if (list[i].size() > maxLength) + maxLength = list[i].size(); + } + + uint charsPerLine = getCharsPerLine(); + uint columnWidth = maxLength + 2; + uint columns = charsPerLine / columnWidth; + + uint lines = list.size() / columns; + + if (list.size() % columns) + lines++; + + // This won't always use all available columns, but even if it did the + // number of lines should be the same so that's good enough. + for (i = 0; i < lines; i++) { + for (j = 0; j < columns; j++) { + uint pos = i + j * lines; + if (pos < list.size()) { + debugPrintf("%*s", -columnWidth, list[pos].c_str()); + } + } + debugPrintf("\n"); + } +} + void Debugger::preEnter() { g_engine->pauseEngine(true); } @@ -447,15 +491,7 @@ bool Debugger::cmdExit(int argc, const char **argv) { // Print a list of all registered commands (and variables, if any), // nicely word-wrapped. bool Debugger::cmdHelp(int argc, const char **argv) { -#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER - const int charsPerLine = _debuggerDialog->getCharsPerLine(); -#elif defined(USE_READLINE) - int charsPerLine, rows; - rl_get_screen_size(&rows, &charsPerLine); -#else - // Can we do better? - const int charsPerLine = 80; -#endif + const int charsPerLine = getCharsPerLine(); int width, size; uint i; diff --git a/gui/debugger.h b/gui/debugger.h index ef6f900974..bc9306c1de 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -28,6 +28,7 @@ #include "common/hashmap.h" #include "common/hash-str.h" #include "common/array.h" +#include "common/str-array.h" namespace GUI { @@ -40,8 +41,12 @@ public: Debugger(); virtual ~Debugger(); + int getCharsPerLine(); + int debugPrintf(const char *format, ...) GCC_PRINTF(2, 3); + void debugPrintColumns(const Common::StringArray &list); + /** * The onFrame() method should be invoked by the engine at regular * intervals (usually once per main loop iteration) whenever the diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex 4f83477c13..4225994810 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/po/POTFILES b/po/POTFILES index 6a865060fc..0eef66bd51 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -2,14 +2,18 @@ gui/about.cpp gui/browser.cpp +gui/browser_osx.mm gui/chooser.cpp +gui/editrecorddialog.cpp gui/error.cpp gui/gui-manager.cpp gui/KeysDialog.h gui/KeysDialog.cpp gui/launcher.cpp gui/massadd.cpp +gui/onscreendialog.cpp gui/options.cpp +gui/predictivedialog.cpp gui/recorderdialog.cpp gui/saveload-dialog.cpp gui/themebrowser.cpp @@ -32,7 +36,7 @@ audio/musicplugin.cpp audio/null.h audio/null.cpp audio/mods/paula.cpp -audio/softsynth/adlib.cpp +audio/adlib.cpp audio/softsynth/appleiigs.cpp audio/softsynth/sid.cpp audio/softsynth/mt32.cpp diff --git a/po/be_BY.po b/po/be_BY.po index 37090afb42..66697d9899 100644 --- a/po/be_BY.po +++ b/po/be_BY.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.7.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-02 17:22+0300\n" "Last-Translator: Ivan Lukyanov <greencis@mail.ru>\n" "Language-Team: Ivan Lukyanov <greencis@mail.ru>\n" @@ -32,7 +32,7 @@ msgstr "Уключаныя ў білд опцыі:" msgid "Available engines:" msgstr "Даступныя рухавічкі:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Паказваць схаваныя файлы" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Уверх" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Уверх" msgid "Cancel" msgstr "Адмена" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Абраць" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Назва:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Прызначыць" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Назва:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Поўная назва гульні" @@ -191,7 +205,7 @@ msgstr "" "беларускую" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<па змаўчанні>" @@ -213,11 +227,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Рухавічок" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Грф" @@ -230,7 +244,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перакрыць глабальныя налады графікі" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Аўдыё" @@ -243,11 +257,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перакрыць глабальныя налады аўдыё" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Гучнасць" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Гучн" @@ -261,7 +275,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перакрыць глабальныя налады гучнасці" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -274,7 +288,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перакрыць глабальныя налады MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -287,11 +301,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перакрыць глабальныя налады MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Шляхі" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Шляхі" @@ -305,7 +319,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Дзе гульня:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Дад. шлях:" @@ -313,42 +327,42 @@ msgstr "Дад. шлях:" msgid "Specifies path to additional data used by the game" msgstr "Паказвае шлях да дадатковых файлаў, дадзеных для гульні" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Дад. шлях:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Захаванні гульняў:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Паказвае шлях да захаванняў гульні" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях зах.:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Не зададзены" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Па змаўчанні" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Абярыце SoundFont" @@ -360,7 +374,7 @@ msgstr "Абярыце дырэкторыю з файламі гульні" msgid "Select additional game directory" msgstr "Абярыце дадатковую дырэкторыю гульні" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Абярыце дырэкторыю для захаванняў" @@ -557,6 +571,24 @@ msgstr "Прагледжана %d дырэкторый..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Знойдзена %d новых гульняў, прапушчана %d раней дададзеных гульняў..." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Пераключыць" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Хуткі рэжым" + #: gui/options.cpp:85 msgid "Never" msgstr "Ніколі" @@ -597,8 +629,8 @@ msgstr "44 кГц" msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Не зададзены" @@ -619,70 +651,70 @@ msgstr "поўнаэкранны рэжым не можа быць зменены" msgid "the aspect ratio setting could not be changed" msgstr "рэжым карэктыроўкі суадносін бакоў не можа быць зменены" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Граф. рэжым:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Рэжым растру:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Спецыяльныя рэжымы рэндэрынгу, падтрымоўваныя некаторымі гульнямі" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Поўнаэкранны рэжым" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Карэкцыя суадносін бакоў" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Карэктаваць суадносіны бакоў для гульняў з адрозненнем 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Упадабаная прылада:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Гукавая прылада:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Зазначае ўпадабаную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Зазначае выходную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Упадабаная:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Гук. прылада:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Эмулятар AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "Гукавая карта AdLib выкарыстоўваецца многімі гульнямі" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Чашчыня гуку:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -690,68 +722,68 @@ msgstr "" "Большыя значэнні задаюць лепшую якасць гуку, аднак яны могуць не " "падтрымлівацца вашай гукавой картай" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Прылада GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Зазначае выходную гукавую прыладу для MIDI" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Не выкарыстоўваць музыку для General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Выкарыстоўваць першую даступную прыладу" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont'ы падтрымліваюцца некаторымі гукавымі картамі, FluidSynth ды " "Timidity" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Змешаны рэжым AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Выкарыстоўваць і MIDI, і AdLib для генерацыі гуку" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Узмацненне MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Налады FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Нал. MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Паказвае гукавую прыладу па змаўчанні для вываду на Roland MT-32/LAPC1/CM32l/" "CM64" -#: gui/options.cpp:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Сапраўдны Roland MT-32 (забараніць эмуляцыю GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -759,16 +791,16 @@ msgstr "" "Адзначце, калі ў вас падключана Roland-сумяшчальная гукавая прылада і вы " "жадаеце яе выкарыстоўваць" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Сапраўдны Roland MT-32 (без эмуляцыі GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Рэжым Roland GS (дазволіць мапінг MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -776,175 +808,175 @@ msgstr "" "Адзначце, калі жадаеце дазволіць мапінг для эмуляцыі MT-32 на прыладзе " "Rolans GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Не выкарыстоўваць музыку для MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Агучка" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Субтытры" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Абое" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Агуч" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Абое" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Паказваць субтытры і прайграваць гаворку" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Выкл. усё" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Гучнасць SFX:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Гучнасць спецыяльных гукавых эфектаў" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. SFX:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Шлях да тэм:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Дзе тэмы:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Паказвае шлях да дадатковых файлаў дадзеных, выкарыстоўваных усімі гульнямі, " "або ScummVM" -#: gui/options.cpp:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Рознае" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Рознае" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Тэма" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Малявалка GUI:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Аўтазахаванне:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Аўтазах.:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Клавішы" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Мова GUI:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Мова графічнага інтэрфейсу ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы павінны перазапусціць ScummVM, каб ужыць змены." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не магу пісаць у абраную дырэкторыю. Калі ласка, азначце іншую." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Абярыце дырэкторыю для тэм GUI" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Абярыце дырэкторыю з дадатковымі файламі" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Абярыце дырэкторыю з плагінамі" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -952,6 +984,29 @@ msgstr "" "Тэма, абраная вамі, не падтрымлівае бягучую мову. Калі вы жадаеце " "выкарыстоўваць гэтую тэму, вам неабходна спачатку пераключыцца на іншую мову." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Выдаліць" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1439,14 +1494,18 @@ msgstr "" msgid "Start anyway" msgstr "Усё адно запусціць" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Эмулятар MAME OPL" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Эмулятар DOSBox OPL" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1496,7 +1555,7 @@ msgstr "Без музыкі" msgid "Amiga Audio Emulator" msgstr "Эмулятар гуку Amiga" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Эмулятар AdLib" @@ -1768,9 +1827,8 @@ msgstr "Хуткі рэжым" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Выхад" @@ -2128,14 +2186,13 @@ msgstr "Пстрычкі выключаны" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Выкарыстоўваць арыгінальныя экраны запісу/чытанні гульні" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Выкарыстоўваць арыгінальныя экраны запісу і захавання гульні замест " @@ -3429,39 +3486,46 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Выкарыстоўваць арыгінальныя экраны запісу і захавання гульні замест " +"зробленых у ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Уключыць рэжым гелія" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Уключыць рэжым гелія" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Выкарыстоўваць альтэрнатыўны набор срэбных курсораў замест звычайных залатых" diff --git a/po/ca_ES.po b/po/ca_ES.po index bfbc9b8c37..1a0a756253 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2013-05-05 14:16+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" @@ -29,7 +29,7 @@ msgstr "Caracterэstiques compilades:" msgid "Available engines:" msgstr "Motors disponibles:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Mostra els fitxers ocults" @@ -50,13 +50,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Amunt" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -64,10 +65,27 @@ msgstr "Amunt" msgid "Cancel" msgstr "CancelЗla" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Escull" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nom:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -100,7 +118,7 @@ msgid "Map" msgstr "Assigna" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -162,10 +180,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nom:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Tэtol complet del joc" @@ -188,7 +202,7 @@ msgstr "" "Anglшs" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<per defecte>" @@ -210,11 +224,11 @@ msgstr "Platafor.:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grрfics" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -227,7 +241,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Canviar les opcions de grрfics" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Рudio" @@ -240,11 +254,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Canviar les opcions d'рudio" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -258,7 +272,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Canviar les opcions de volum" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -271,7 +285,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Canviar les opcions de MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -284,11 +298,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Canviar les opcions de MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Camins" @@ -302,7 +316,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camэ joc:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Camэ extra:" @@ -310,42 +324,42 @@ msgstr "Camэ extra:" msgid "Specifies path to additional data used by the game" msgstr "Especifica el camэ de dades addicionals utilitzades pel joc" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Camэ de partides:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Especifica on es desaran les partides" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Partides:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Cap" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Per defecte" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Seleccioneu el fitxer SoundFont" @@ -357,7 +371,7 @@ msgstr "Seleccioneu el directori amb les dades del joc" msgid "Select additional game directory" msgstr "Seleccioneu el directori addicional del joc" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Seleccioneu el directori de les partides desades" @@ -560,6 +574,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Commuta" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Mode rрpid" + #: gui/options.cpp:85 msgid "Never" msgstr "Mai" @@ -600,8 +632,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Cap" @@ -622,70 +654,70 @@ msgstr "no s'ha pogut canviar l'ajust de pantalla completa" 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:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Mode grрfic:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Mode de pintat:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Modes de tramat especials suportats per alguns jocs" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Mode pantalla completa" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Disp. preferit:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 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:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferit:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib s'utilitza per la mњsica de molts jocs" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Freq. sortida:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -693,67 +725,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:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Dispositiu GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 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:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "No utilitzis mњsica General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Utilitza el primer dispositiu disponible" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "Fitxer SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "Algunes targes de so, FluidSynth i Timidity suporten SoundFont" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Mode combinat AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Guany MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Configuraciѓ de FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -761,193 +793,193 @@ msgstr "" "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so " "compatible amb Roland connectat al vostre ordinador" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Mode Roland GS (desactiva el mapeig GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "No utilitzis mњsica de Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Veus" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Subtэtols" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Velocitat de subt.:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Veus" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Mostra els subtэtols i reprodueix la veu" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Veloc. de subt.:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Silenciar tot" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volum dels sons d'efectes especials" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Camэ dels temes:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Camэ temes:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Camэ dels connectors:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camэ de connectors:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Pintat GUI:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Desat automрtic:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-desat:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Tecles" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Idioma GUI:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfэcie d'usuari de ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Seleccioneu el directori dels temes" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Seleccioneu el directori dels fitxers extra" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Seleccioneu el directori dels connectors" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -955,6 +987,29 @@ msgstr "" "El tema que heu seleccionat no suporta l'idioma actual. Si voleu utilitzar " "aquest tema primer haureu de canviar a un altre idioma." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Suprimeix" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1443,14 +1498,18 @@ msgstr "" msgid "Start anyway" msgstr "Inicia de totes maneres" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Emulador OPL de MAME" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Emulador OPL de DOSBox" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1500,7 +1559,7 @@ msgstr "Sense mњsica" msgid "Amiga Audio Emulator" msgstr "Emulador d'рudio Amiga" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Emulador d'AdLib" @@ -1773,9 +1832,8 @@ msgstr "Mode rрpid" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Surt" @@ -2133,14 +2191,13 @@ msgstr "Clicat desactivat" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Utilitza les pantalles originals de desat/cрrrega" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3437,39 +3494,45 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Utilitza les pantalles originals de desat/cрrrega, en lloc de les de ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Activa el mode heli" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Activa el mode heli" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Utilitza el conjunt alternatiu de cursors platejats, en lloc dels normals " "daurats" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 1e5ebc3b42..28c50ed514 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.7.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-07-26 18:48+0200\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2015-07-26 18:51+0200\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" @@ -33,7 +33,7 @@ msgstr "Zakompilovanщ funkce:" msgid "Available engines:" msgstr "Dostupnс jсdra:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Zobrazit skrytщ soubory" @@ -54,12 +54,13 @@ msgctxt "lowres" msgid "Go up" msgstr "Jэt nahoru" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 #: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 @@ -68,10 +69,29 @@ msgstr "Jэt nahoru" msgid "Cancel" msgstr "ZruЙit" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Zvolit" +#: gui/editrecorddialog.cpp:58 +#, fuzzy +msgid "Author:" +msgstr "Autor:" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Jmщno" + +#: gui/editrecorddialog.cpp:60 +#, fuzzy +msgid "Notes:" +msgstr "Poznсmky:" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -104,7 +124,7 @@ msgid "Map" msgstr "Mapovat" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -166,10 +186,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Jmщno" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "кpln§ nсzev hry" @@ -190,7 +206,7 @@ msgid "" msgstr "Jazyk hry. Toto z vaЙэ Љpanьlskщ verze neudьlс Anglickou" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<v§chozэ>" @@ -212,11 +228,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Jсdro" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Obraz" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -229,7 +245,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Zvuk" @@ -242,11 +258,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Hlasitost" @@ -260,7 +276,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -273,7 +289,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -286,11 +302,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Cesty" @@ -304,7 +320,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Dodateшnс Cesta:" @@ -312,42 +328,42 @@ msgstr "Dodateшnс Cesta:" msgid "Specifies path to additional data used by the game" msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Stanovuje, kam jsou umэstьny vaЙe uloОenщ hry" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ўсdnщ" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "V§chozэ" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Vybrat SoundFont" @@ -359,7 +375,7 @@ msgstr "Vyberte adresсј s daty hry" msgid "Select additional game directory" msgstr "Vyberte dodateшn§ adresсј hry" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Vyberte adresсј pro uloОenщ hry" @@ -556,6 +572,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Pјepnout" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Rychl§ reОim" + #: gui/options.cpp:85 msgid "Never" msgstr "Nikdy" @@ -596,8 +630,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ўсdnщ" @@ -618,70 +652,70 @@ msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" msgid "the aspect ratio setting could not be changed" msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "ReОim obrazu:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "ReОim vykreslenэ:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "ReОim celщ obrazovky" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Korekce pomьru stran" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Korigovat pomьr stran pro hry 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Prioritnэ Zaјэzenэ:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Prioritnэ Zaј.:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emulсtor" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "V§stup. frekvence:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -689,66 +723,66 @@ msgstr "" "VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi " "zvukovou kartou" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM Zaјэzenэ:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "NepouОэvat hudbu General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "PouОэt prvnэ dostupnщ zaјэzenэ" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "SmэЙen§ reОim AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "PouОэt obь zvukovщ generace MIDI a AdLib" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Zesэlenэ MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Nastavenэ FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Zaјэzenэ MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -756,16 +790,16 @@ 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:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Zaјэzenэ Roland GS (zapne mapovсnэ MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -773,173 +807,173 @@ msgstr "" "ZaЙkrtnьte, pokud chcete povolit zсplaty mapovсnэ umoОђujэcэ emulovat MT-32 " "na zaјэzenэ Roland GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "NepouОэvat hudbu Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Text a иeш" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "иeш" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Titulky" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Oba" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "иeш" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Titl" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Zobrazit titulky a pјehrсvat јeш" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Rychlost titulkљ" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Ztlumit VЙe" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Hlasitost speciсlnэch zvukov§ch efektљ" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Vzhled:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI Vykreslovaш:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Klсvesy" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Jazyk GUI" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Jazyk GUI ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Vyberte adresсј pro vhledy GUI" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Vyberte adresсј pro dodateшnщ soubory" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Vyberte adresсј pro zсsuvnщ moduly" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -947,6 +981,29 @@ msgstr "" "Vzhled, kter§ jste zvolili, nepodporuje VсЙ souшasn§ jazyk. Pokud chcete " "tento vzhled pouОэt, musэte nejdјэve pјepnout na jin§ jazyk." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Smazat" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "Nahrсvat nebo pјehrсt hru" @@ -1430,14 +1487,18 @@ msgstr "" msgid "Start anyway" msgstr "Pјesto spustit" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL Emulсtor" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL Emulсtor" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1487,7 +1548,7 @@ msgstr "Bez hudby" msgid "Amiga Audio Emulator" msgstr "Emulсtor zvuku Amiga" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib Emulсtor" @@ -2120,14 +2181,13 @@ msgstr "Kliknutэ Zakсzсno" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3423,37 +3483,45 @@ msgstr "Zobrazit poшэtadlo FPS" msgid "Show the current number of frames per second in the upper left corner" msgstr "Zobrazit souшasn§ poшet snэmkљ za sekundu v hornэm levщm rohu" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ mэsto ze ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "Dvojitщ snэmky za sekundu" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +#, fuzzy +msgid "Increase framerate from 30 to 60 FPS" msgstr "Zv§Йit hernэ snэmky za sekundu z 30 na 60" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 msgid "Enable Venus" msgstr "Povolit Venus" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 msgid "Enable the Venus help system" msgstr "Povolit systщm nсpovьdy Venus" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "Zakсzat animaci pјi otсшenэ" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +#, fuzzy +msgid "Disable animation while turning in panorama mode" msgstr "Zakсzat animaci pјi otсшenэ v panoramatickщm reОimu" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +#, fuzzy +msgid "Use high resolution MPEG video" msgstr "PouОэt videa MPEG ve vysokщm rozliЙenэ" -#: engines/zvision/detection.cpp:287 -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +#: engines/zvision/detection_tables.h:92 +#, fuzzy +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "PouОэt videa MPEG ve vysokщm rozliЙenэ pochсzejэcэ z DVD verze, namэsto " "videэ AVI v nэzkщm rozliЙenэ." diff --git a/po/da_DA.po b/po/da_DA.po index 82760de5d8..8556dd7734 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-09 17:34+0100\n" "Last-Translator: Steffen Nyeland <steffen@nyeland.dk>\n" "Language-Team: Steffen Nyeland <steffen@nyeland.dk>\n" @@ -31,7 +31,7 @@ msgstr "Funktioner kompileret ind:" msgid "Available engines:" msgstr "Tilgцngelige \"motorer\":" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Vis skjulte filer" @@ -52,13 +52,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Gх op" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -66,10 +67,27 @@ msgstr "Gх op" msgid "Cancel" msgstr "Fortryd" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Vцlg" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Navn:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -102,7 +120,7 @@ msgid "Map" msgstr "Kortlцg" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -164,10 +182,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Navn:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Fuld titel pх spillet" @@ -190,7 +204,7 @@ msgstr "" "engelsk" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -212,11 +226,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -229,7 +243,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Lyd" @@ -242,11 +256,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" @@ -260,7 +274,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -273,7 +287,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -286,11 +300,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Stier" @@ -304,7 +318,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Ekstra sti:" @@ -312,42 +326,42 @@ msgstr "Ekstra sti:" msgid "Specifies path to additional data used by the game" msgstr "Angiver sti til ekstra data der bruges i spillet" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Gemme sti:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Gemme sti:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Vцlg SoundFont" @@ -359,7 +373,7 @@ msgstr "Vцlg bibliotek med spil data" msgid "Select additional game directory" msgstr "Vцlg ekstra spil bibliotek" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Vцlg bibliotek til spil gemmer" @@ -557,6 +571,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Skift" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Hurtig tilstand" + #: gui/options.cpp:85 msgid "Never" msgstr "Aldrig" @@ -597,8 +629,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ingen" @@ -619,70 +651,70 @@ msgstr "fuld skцrm indstillingen kunne ikke цndres" msgid "the aspect ratio setting could not be changed" msgstr "billedformat indstillingen ikke kunne цndres" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafik tilstand:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understјttet a nogle spil" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Fuldskцrms tilstand" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Billedformat korrektion" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrekt billedformat til 320x200 spil" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Foretruk. enhed:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretruk. enh.:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -690,64 +722,64 @@ msgstr "" "Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit " "lydkort" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM enhed:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Angiver standard lyd enhed for Generel MIDI-udgang" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Brug ikke Generel MIDI musik" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Brug fјrste tilgцngelig enhed" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Blandet AdLib/MIDI tilstand" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Brug bхde MIDI og AdLib lyd generering" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI lydstyrke:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth indstillinger" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 enhed:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -755,16 +787,16 @@ msgstr "" "Kryds af hvis du vil bruge din rigtige hardware Roland-kompatible lyd enhed " "tilsluttet til din computer" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Цgte Roland MT-32 (ingen GM emulering)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS enhed (aktivщr MT-32 tilknytninger)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -772,173 +804,173 @@ msgstr "" "Kryds af hvis du vil aktivere patch tilknytninger, for at emulere en MT-32 " "pх en Roland GS enhed" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Brug ikke Roland MT-32 musik" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Begge" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Vis undertekster og afspil tale" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Mute alle" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI renderer:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Sprog:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Vцlg bibliotek for GUI temaer" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Vцlg bibliotek for plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -946,6 +978,29 @@ msgstr "" "Temaet du valgte understјtter ikke dit aktuelle sprog. Hvis du јnsker at " "bruge dette tema, skal du skifte til et andet sprog fјrst." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Slet" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1433,14 +1488,18 @@ msgstr "" msgid "Start anyway" msgstr "Start alligevel" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1489,7 +1548,7 @@ msgstr "Ingen musik" msgid "Amiga Audio Emulator" msgstr "Amiga lyd emulator" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib emulator" @@ -1761,9 +1820,8 @@ msgstr "Hurtig tilstand" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Afslut" @@ -2122,14 +2180,13 @@ msgstr "Klik deaktiveret" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Brug original gem/indlцs skцrme" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3417,39 +3474,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "Brug de originale gem/indlцs skцrme, istedet for dem fra ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Aktivщr helium tilstand" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Aktivщr helium tilstand" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Brug det alternative sцt af sјlv markјrer, i stedet for de normale gyldne" diff --git a/po/de_DE.po b/po/de_DE.po index 0e7e5d901c..56d363b597 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2015-07-04 12:06+0200\n" "Last-Translator: Lothar Serra Mari <scummvm@rootfather.de>\n" "Language-Team: Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari " @@ -32,7 +32,7 @@ msgstr "Verwendete Funktionen:" msgid "Available engines:" msgstr "Verfќgbare Spiele-Engines:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" @@ -54,13 +54,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Pfad hoch" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -68,10 +69,29 @@ msgstr "Pfad hoch" msgid "Cancel" msgstr "Abbrechen" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Auswфhlen" +#: gui/editrecorddialog.cpp:58 +#, fuzzy +msgid "Author:" +msgstr "Autor:" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Name:" + +#: gui/editrecorddialog.cpp:60 +#, fuzzy +msgid "Notes:" +msgstr "Notizen:" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -104,7 +124,7 @@ msgid "Map" msgstr "Zuweisen" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -166,10 +186,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Name:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Voller Name des Spiels" @@ -192,7 +208,7 @@ msgstr "" "Spiels in eine deutsche verwandeln." #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<Standard>" @@ -214,11 +230,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Engine" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -231,7 +247,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globale Grafik-Einstellungen ќbergehen" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Audio" @@ -244,11 +260,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globale Audio-Einstellungen ќbergehen" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Lautstфrke" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Lautst." @@ -262,7 +278,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globale Lautstфrke-Einstellungen ќbergehen" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -275,7 +291,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -288,11 +304,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Pfade" @@ -306,7 +322,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Extras:" @@ -314,42 +330,42 @@ msgstr "Extras:" msgid "Specifies path to additional data used by the game" msgstr "Legt das Verzeichnis fќr zusфtzliche Spieldateien fest." -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Extras:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Spielstфnde:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Legt fest, wo die Spielstфnde gespeichert werden." -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Spielstфnde:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Keiner" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "SoundFont auswфhlen" @@ -361,7 +377,7 @@ msgstr "Verzeichnis mit Spieldateien auswфhlen" msgid "Select additional game directory" msgstr "Verzeichnis mit zusфtzlichen Dateien auswфhlen" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" @@ -561,6 +577,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Wechsle" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Schneller Modus" + #: gui/options.cpp:85 msgid "Never" msgstr "Niemals" @@ -601,8 +635,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Kein SoundFont" @@ -624,72 +658,72 @@ msgid "the aspect ratio setting could not be changed" msgstr "" "Einstellung fќr Seitenverhфltniskorrektur konnte nicht geфndert werden." -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafikmodus:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Render-Modus:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "" "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt." -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Vollbildmodus" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Seitenverhфltnis korrigieren" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Bevorzugtes Gerфt:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib-Emulator" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet." -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Ausgabefrequenz:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -697,68 +731,68 @@ msgstr "" "Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise " "nicht von jeder Soundkarte unterstќtzt." -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM-Gerфt:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 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:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Keine General-MIDI-Musik" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Erstes verfќgbares Gerфt" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Gemischter AdLib/MIDI-Modus" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Kombiniert MIDI-Musik mit AdLib-Soundeffekten" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI-Lautstфrke:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth-Einstellungen" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32-Gerфt:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Echte Roland MT-32 (GM-Emulation deaktiviert)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -766,16 +800,16 @@ msgstr "" "Wфhlen Sie dies aus, wenn Sie ein echtes Roland-kompatibles Soundgerфt " "verwenden" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland MT-32 (keine GM-Emulation)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland-GS-Gerфt (MT-32-Zuweisungen aktivieren)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -783,178 +817,178 @@ msgstr "" "Wфhlen Sie dies aus, wenn Sie ausbessernde Instrumentzuweisungen aktivieren " "mіchten, um MT-32 auf einem Roland-GS-Gerфt zu emulieren." -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Keine Roland-MT-32-Musik" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Sprache und Text:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Sprache" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Untertitel" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Beides" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Untertitel-Tempo:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text u. Sprache:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Spr." -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Text" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "S+T" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Untertitel anzeigen und Sprachausgabe aktivieren" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Text-Tempo:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Alles stumm" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Effektlautstфrke:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Lautstфrke spezieller Gerфusch-Effekte" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Effektlautst.:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Sprachlautstфrke:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Sprachlautst.:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Themen:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Themen:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Sonstiges" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Andere" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI-Renderer:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autom. Speichern:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autospeichern:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Tasten" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Sprache:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Sprache der ScummVM-Oberflфche" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Verzeichnis fќr Oberflфchen-Themen" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 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:1469 +#: gui/options.cpp:1467 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -963,6 +997,29 @@ msgstr "" "dieses Thema benutzen wollen, mќssen Sie erst zu einer anderen Sprache " "wechseln." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Lіschen" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "Spiel aufzeichnen oder wiedergeben" @@ -1453,14 +1510,18 @@ msgstr "" msgid "Start anyway" msgstr "Trotzdem starten" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME-OPL-Emulator" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox-OPL-Emulator" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1510,7 +1571,7 @@ msgstr "Keine Musik" msgid "Amiga Audio Emulator" msgstr "Amiga-Audio-Emulator" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib-Emulator" @@ -1782,9 +1843,8 @@ msgstr "Schneller Modus" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Beenden" @@ -2144,14 +2204,13 @@ msgstr "Klicken deaktiviert" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Originale Spielstand-Menќs" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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." @@ -3478,37 +3537,46 @@ msgid "Show the current number of frames per second in the upper left corner" msgstr "" "Zeige die aktuelle Anzahl von Bildern pro Sekunde in der oberen linken Ecke" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Verwendet die originalen Menќs zum Speichern und Laden statt der von ScummVM." + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "FPS verdoppeln" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +#, fuzzy +msgid "Increase framerate from 30 to 60 FPS" msgstr "Bilder pro Sekunde im Spiel von 30 auf 60 erhіhen" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 msgid "Enable Venus" msgstr "Venus aktivieren" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 msgid "Enable the Venus help system" msgstr "Aktiviere das Venus-Hilfesystem" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "Animation wфhrend Drehen ausschalten" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +#, fuzzy +msgid "Disable animation while turning in panorama mode" msgstr "Animation wфhrend Drehen im Panorama-Modus ausschalten" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +#, fuzzy +msgid "Use high resolution MPEG video" msgstr "Nutze hochauflіsende MPEG-Filme" -#: engines/zvision/detection.cpp:287 -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +#: engines/zvision/detection_tables.h:92 +#, fuzzy +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Verwende hochauflіsende MPEG-Filme der DVD-Version anstelle der AVI-Filme" diff --git a/po/es_ES.po b/po/es_ES.po index 32f3aba74e..3398957b22 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-06 20:39+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr "Caracterэsticas incluidas:" msgid "Available engines:" msgstr "Motores disponibles:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Mostrar archivos ocultos" @@ -51,13 +51,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -65,10 +66,27 @@ msgstr "Arriba" msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Aceptar" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nombre:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -101,7 +119,7 @@ msgid "Map" msgstr "Asignar" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -163,10 +181,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nombre:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Tэtulo completo del juego" @@ -189,7 +203,7 @@ msgstr "" "juego" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<por defecto>" @@ -211,11 +225,11 @@ msgstr "Plat.:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Grсf." @@ -228,7 +242,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Opciones grсficas especэficas" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Sonido" @@ -241,11 +255,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Opciones de sonido especэficas" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volumen" @@ -259,7 +273,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Opciones de volumen especэficas" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -272,7 +286,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Opciones de MIDI especэficas" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -285,11 +299,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Opciones de MT-32 especэficas" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Rutas" @@ -303,7 +317,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Adicional:" @@ -311,42 +325,42 @@ msgstr "Adicional:" msgid "Specifies path to additional data used by the game" msgstr "Especifica un directorio para datos adicionales del juego" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Partidas:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Especifica dѓnde guardar tus partidas" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Partidas:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ninguna" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Por defecto" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Selecciona un SoundFont" @@ -358,7 +372,7 @@ msgstr "Selecciona el directorio del juego" msgid "Select additional game directory" msgstr "Selecciona el directorio adicional" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Selecciona el directorio para partidas guardadas" @@ -556,6 +570,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Cambiar" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Modo rсpido" + #: gui/options.cpp:85 msgid "Never" msgstr "Nunca" @@ -596,8 +628,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ninguno" @@ -618,73 +650,73 @@ msgstr "no se ha podido cambiar el ajuste de pantalla completa" 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:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Renderizado:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Modos especiales de expansiѓn compatibles con algunos juegos" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Correcciѓn de aspecto" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregir relaciѓn de aspecto en juegos 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Disp. preferido:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 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:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Emul. de AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib se usa para la mњsica en muchos juegos" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Frec. de salida:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -692,68 +724,68 @@ msgstr "" "Los valores mсs altos ofrecen mayor calidad, pero puede que tu tarjeta de " "sonido no sea compatible" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Especifica el dispositivo de salida General MIDI por defecto" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "No usar mњsica General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Utilizar el primer dispositivo disponible" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Ganancia MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Opciones de FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Disp. MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -761,16 +793,16 @@ msgstr "" "Marcar si se quiere usar un dispositivo de sonido real conectado al " "ordenador y compatible con Roland" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sin emulaciѓn GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (activar conversiѓn MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -778,174 +810,174 @@ msgstr "" "Marca esta opciѓn si quieres activar la conversiѓn para emular una MT-32 en " "un dispositivo Roland GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "No usar mњsica Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Voces" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Vel. de subtэtulos:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Reproducir voces y subtэtulos" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vel. de subt.:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Silenciar" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volumen de los efectos de sonido" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Interfaz:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Idioma:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfaz de ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Tienes que reiniciar ScummVM para aplicar los cambios." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Selecciona el directorio de temas" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Selecciona el directorio adicional" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Selecciona el directorio de plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -953,6 +985,29 @@ msgstr "" "El tema seleccionado no es compatible con el idioma actual. Si quieres usar " "este tema debes cambiar a otro idioma primero." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Borrar" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1440,14 +1495,18 @@ msgstr "" msgid "Start anyway" msgstr "Jugar aun asэ" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Emulador OPL de MAME" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Emulador OPL de DOSBox" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1497,7 +1556,7 @@ msgstr "Sin mњsica" msgid "Amiga Audio Emulator" msgstr "Emulador de Amiga Audio" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Emulador de AdLib" @@ -1769,9 +1828,8 @@ msgstr "Modo rсpido" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Salir" @@ -2130,14 +2188,13 @@ msgstr "Clic desactivado" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Usar pantallas de guardar/cargar originales" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3435,39 +3492,45 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Utilizar las pantallas de guardar/cargar originales, en vez de las de ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Activar el modo helio" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Activar el modo helio" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Usar los cursores plateados alternativos, en vez de los dorados normales" @@ -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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\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,7 +29,7 @@ msgstr "Ezaugarri erantsiak:" msgid "Available engines:" msgstr "Motore erabilgarriak:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 #, fuzzy msgid "Show hidden files" msgstr "Kontsola erakutsi / ezkutatu" @@ -51,13 +51,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Joan gora" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -65,10 +66,27 @@ msgstr "Joan gora" msgid "Cancel" msgstr "Utzi" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Aukeratu" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Izena:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -101,7 +119,7 @@ msgid "Map" msgstr "Esleitu" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -163,10 +181,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Izena:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Jokoaren izen osoa" @@ -188,7 +202,7 @@ msgstr "" "Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<lehenetsia>" @@ -211,11 +225,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Aztertu" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafikoak" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -228,7 +242,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ezarpen grafiko globalak baliogabetu" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Soinua" @@ -241,11 +255,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Soinu ezarpen globalak baliogabetu" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Bolumena" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Bolumena" @@ -259,7 +273,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Bolumen ezarpen globalak baliogabetu" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -272,7 +286,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "MIDI ezarpen globalak baliogabetu" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -285,11 +299,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "MT-32 ezarpen globalak baliogabetu" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Bide-izenak" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Bideak" @@ -303,7 +317,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jokoa:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Gehigarriak:" @@ -311,42 +325,42 @@ msgstr "Gehigarriak:" msgid "Specifies path to additional data used by the game" msgstr "Jokoak erabiltzen duen datu gehigarrien bide-izena" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Gehigarria:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Partida gordeak:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Zure gordetako partidak non gordeko diren zehazten du" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Partida gordeak:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Bat ere ez" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Lehenetsia" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "SoundFont-a aukeratu" @@ -358,7 +372,7 @@ msgstr "Jokoaren direktorioa aukeratu" msgid "Select additional game directory" msgstr "Direktorio gehigarria aukeratu" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Partida gordeen direktorioa aukeratu" @@ -560,6 +574,24 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "%d joko berri aurkitu dira, aurretik gehituriko %d ez dira kontuan hartu" +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Aldatu" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Modu bizkorra" + #: gui/options.cpp:85 msgid "Never" msgstr "Inoiz ez" @@ -600,8 +632,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Bat ere ez" @@ -622,70 +654,70 @@ msgstr "ezin izan da pantaila-osoaren ezarpena aldatu" msgid "the aspect ratio setting could not be changed" msgstr "formatu-ratioaren ezarpena ezin izan da aldatu" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Modu grafikoa:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Renderizazioa:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Joko batzuk onarturiko lausotze-modu bereziak" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Pantaila osoa" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Formatu-ratioaren zuzenketa" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "320x200 jokoentzako formatu-ratioa zuzendu" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Gogoko gailua:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Irteerako soinu txartel edo emuladorea ezartzen du" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Gail. gogokoa:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emuladorea:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib musikarako hainbat jokotan erabiltzen da" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Irteera maizt.:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -693,68 +725,68 @@ msgstr "" "Balio altuagoek soinu kalitate hobea ezartzen dute, baina baliteke zure " "soinu-txartela bateragarria ez izatea" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM gailua:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Ez erabili General MIDI musika" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Erabilgarri dagoen lehen gailua erabili" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib/MIDI modua" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Soinua sortzerakoan MIDI eta AdLib erabili" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI irabazia:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 gailua:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -762,190 +794,190 @@ msgstr "" "Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-" "gailua erabiltzeko" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Ez erabili Roland MT-32 musika" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Ahotsa" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Azpitituluak" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Biak" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Azpitit. abiadura:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Ahots." -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Azp." -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Biak" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Azpit. abiadura:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Mututu dena" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Soinu efektu berezien bolumena" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Beste" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Beste" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Gaia:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Interfazea:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Teklak" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Hizkuntza" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "ScummVM interfazearen hizkuntza" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "ScummVM berrabiarazi behar duzu aldaketak indarrean jartzeko" -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Gaien direktorioa aukeratu" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Fitxategi gehigarrien direktorioa aukeratu" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Pluginen direktorioa aukeratu" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -953,6 +985,29 @@ msgstr "" "Aukeraturiko gaia ez da zure hizkuntzarekin bateragarria. Gai hau erabili " "nahi baduzu, aurretik beste hizkuntza batera pasa behar duzu." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Ezabatu" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1445,14 +1500,18 @@ msgstr "" msgid "Start anyway" msgstr "Jolastu berdin-berdin" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emuladorea" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emuladorea" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1502,7 +1561,7 @@ msgstr "Musikarik ez" msgid "Amiga Audio Emulator" msgstr "Amiga Audio emuladorea" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib emuladorea" @@ -1775,9 +1834,8 @@ msgstr "Modu bizkorra" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Irten" @@ -2137,14 +2195,13 @@ msgstr "Klikatzea desgaituta" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -3434,38 +3491,42 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Roland GS modua gaitu" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Roland GS modua gaitu" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +#: engines/zvision/detection_tables.h:92 +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" #~ msgid "EGA undithering" diff --git a/po/fi_FI.po b/po/fi_FI.po index 04aea37268..7851775712 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2012-12-01 19:37+0200\n" "Last-Translator: Toni Saarela <saarela@gmail.com>\n" "Language-Team: Finnish\n" @@ -30,7 +30,7 @@ msgstr "Tфhфn versioon kффnnetyt ominaisuudet:" msgid "Available engines:" msgstr "Tuetut pelimoottorit:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 #, fuzzy msgid "Show hidden files" msgstr "Nфytф / piilota konsoli" @@ -52,13 +52,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Siirry ylіs" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -66,10 +67,27 @@ msgstr "Siirry ylіs" msgid "Cancel" msgstr "Peruuta" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Valitse" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nimi:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -102,7 +120,7 @@ msgid "Map" msgstr "Nфppфinkartta" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -164,10 +182,6 @@ msgctxt "lowres" msgid "ID:" msgstr "Tunniste:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nimi:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Pelin koko nimi" @@ -190,7 +204,7 @@ msgstr "" "englanninkieliseksi." #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<oletus>" @@ -212,11 +226,11 @@ msgstr "Alusta:" msgid "Engine" msgstr "Moottori" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafiikka" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -229,7 +243,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ohita globaalit grafiikka-asetukset" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Ффni" @@ -242,11 +256,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ohita globaalit ффniasetukset" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Voimakkuus" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Voimakkuus" @@ -260,7 +274,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ohita globaalit ффnenvoimakkuusasetukset" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -273,7 +287,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ohita globaalit MIDI-asetukset" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -286,11 +300,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ohita globaalit MT-32 asetukset" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Polut" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Polut" @@ -304,7 +318,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pelin polku:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Lisфkansio:" @@ -312,42 +326,42 @@ msgstr "Lisфkansio:" msgid "Specifies path to additional data used by the game" msgstr "Mффrittфф polun lisфtiedostoihin joita peli mahdollisesti kфyttфф" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Lisфkansio:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Mффrittфф polun pelitallennuksille" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ei mффritelty" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Oletus" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Valitse ффnifontti" @@ -359,7 +373,7 @@ msgstr "Valitse pelin kansio" msgid "Select additional game directory" msgstr "Valitse lisфkansio pelille" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Valitse kansio pelitallennuksille" @@ -561,6 +575,24 @@ msgstr "" "%d uutta peliф lіytyi, jфtettiin %d peliф huomiotta, koska ne oli jo lisфtty " "aiemmin." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Vaihda" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Nopea moodi" + #: gui/options.cpp:85 msgid "Never" msgstr "Ei koskaan" @@ -601,8 +633,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ei kфytіssф" @@ -623,72 +655,72 @@ msgstr "kokoruututilaa ei voitu muuttaa" msgid "the aspect ratio setting could not be changed" msgstr "kuvasuhdekorjausasetusta ei voitu muuttaa" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafiikkatila:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Renderіintitila:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Erityiset dithering asetukset joita jotkut pelit tukevat" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Kokoruututila" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Kuvasuhteen korjaus" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Oikea kuvasuhde 320x200 peleille" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Ensisijainen laite:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Mффrittфф ффnilaitteen tai ффnikorttiemulaattorin jota ensisijaisesti tulisi " "kфyttфф" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Mффrittфф ффnikortin tai ффnikorttia emuloivan ohjelmiston" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Ensisijainen:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emulaattori:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLibiф kфytetффn monien pelien musiikeissa" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Taajuus:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -696,65 +728,65 @@ msgstr "" "Isommat taajuudet merkitsevфt parempaa ффnenlaatua, mutta ффnikorttisi ei " "ehkф tue niitф." -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM laite:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Mффrittфф oletuksena kфytettфvфn ффnilaitteen General MIDIlle" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Фlф kфytф General MIDIф musiikissa" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Kфytф ensimmфistф laitetta" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "Ффnifontti:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "Jotkut ффnikortit tukevat ффnifonttia (SoundFont), FluidSynth ja Timidity" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "Ффnifontti:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Yhdistetty AdLib/MIDI tila" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Kфytф sekф MIDIф ettф Adlibiф ффnentuotantoon" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDIn ффnilisфys:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 laite:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -762,191 +794,191 @@ msgstr "" "Valitse jos haluat kфyttфф aitoa Roland-yhteensopivaa laittetta joka on " "kytketty tietokoneeseesi" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Фlф kфytф Roland MT-32 musiikkia" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Puhe" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Tekstitys" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Tekstin nopeus:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Puhe" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Tekstit" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Nфytф tekstitys ja kфytф puhetta" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekstin nopeus:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Vaimenna" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Erikoisefektit" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Muut" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Muut" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Teema" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI renderіijф:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Nфppфimet" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "ScummVM:n kieli:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "ScummVM kфyttіliittymфn kieli" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Valittuun hakemistoon ei voi kirjoittaa. Valitse toinen hakemisto." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Valitse hakemisto kфyttіliittymфn teemoille" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Valitse hakemisto lisфtiedostoille" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Valitse hakemisto plugineille" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -954,6 +986,29 @@ msgstr "" "Valitsemasi teema ei tue nykyistф valitsemaasi kieltф. Vaihda kieli ensin, " "ja yritф sitten uudelleen." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Poista" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1443,14 +1498,18 @@ msgstr "" msgid "Start anyway" msgstr "Pelaa silti" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emulaattori" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulaattori" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1500,7 +1559,7 @@ msgstr "Ei musiikkia" msgid "Amiga Audio Emulator" msgstr "Amiga Audio emulaattori" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib emulaattori" @@ -1775,9 +1834,8 @@ msgstr "Nopea moodi" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Lopeta" @@ -2138,14 +2196,13 @@ msgstr "Klikkaus pois pффltф" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja, ScummVM valikoiden sijaan" @@ -3428,39 +3485,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja, ScummVM valikoiden sijaan" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Kфytф helium moodia" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Kфytф helium moodia" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "Kфytф vaihtoehtoisia hopeisia kursoreita normaalien kultaisten sijaan" #~ msgid "EGA undithering" diff --git a/po/fr_FR.po b/po/fr_FR.po index 2627e1e54f..64247a45bf 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-05 13:49-0000\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <scummvm-devel@lists.sf.net>\n" @@ -31,7 +31,7 @@ msgstr "Options incluses:" msgid "Available engines:" msgstr "Moteurs disponibles:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Afficher les fichiers cachщs" @@ -52,13 +52,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Remonter" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -66,10 +67,27 @@ msgstr "Remonter" msgid "Cancel" msgstr "Annuler" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Choisir" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nom:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -102,7 +120,7 @@ msgid "Map" msgstr "Affecter" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -164,10 +182,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nom:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Nom complet du jeu" @@ -190,7 +204,7 @@ msgstr "" "espagnole du jeu." #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<defaut>" @@ -212,11 +226,11 @@ msgstr "Systшme:" msgid "Engine" msgstr "Moteur" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Graphique" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -229,7 +243,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Audio" @@ -242,11 +256,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -260,7 +274,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -273,7 +287,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -286,11 +300,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Chemins" @@ -304,7 +318,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Chemin du Jeu:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Extra:" @@ -312,42 +326,42 @@ msgstr "Extra:" msgid "Specifies path to additional data used by the game" msgstr "Dщfinie un chemin vers des donnщes suplщmentaires utilisщes par le jeu" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Sauvegardes:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Sauvegardes:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Aucun" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Dщfaut" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Choisir une banque de sons" @@ -359,7 +373,7 @@ msgstr "Sщlectionner le rщpertoire contenant les donnщes du jeu" msgid "Select additional game directory" msgstr "Sщlectionner un rщpertoire supplщmentaire" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" @@ -559,6 +573,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Commuter" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Mode rapide" + #: gui/options.cpp:85 msgid "Never" msgstr "Jamais" @@ -599,8 +631,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Aucune" @@ -621,72 +653,72 @@ msgstr "le mode plein щcran n'a pu ъtre changщ." 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:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Mode graphique:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Mode de rendu:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Mode spщcial de tramage supportщ par certains jeux" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Plein щcran" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Correction du rapport d'aspect" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrige le rapport d'aspect pour les jeu 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 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:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Щmulateur AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Frщquence:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -694,68 +726,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:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Sortie GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 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:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Ne pas utiliser la musique General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Utiliser le premier pщriphщrique disponible" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "Banque de sons:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Mode mixe AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Utiliser р la fois MIDI et AdLib" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Gain MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Paramшtres FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Sortie MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -763,16 +795,16 @@ msgstr "" "Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland " "connectщ р l'ordinateur" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 exacte (pas d'щmu GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS (active le mappage MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -780,178 +812,178 @@ msgstr "" "Utilisez cette option si vous voulez activez le mappage р la volщe pour une " "щmulation MT-32 sur un appareil Roland GS." -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Ne pas utiliser la musique Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Voix" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Sous-titres" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Les deux" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Voix" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Affiche les sous-titres et joue les dialogues audio" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Volume Musique:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musique:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Silence" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Volume Bruitage:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volume des effets spщciaux sonores" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Bruitage:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Volume Dialogues:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Dialogues:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Thшme:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Interface:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Sauvegarde auto:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Sauvegarde:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Touches" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Langue:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Langue de l'interface graphique de ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Sщlectionner le rщpertoire des thшmes d'interface" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Sщlectionner le rщpertoire pour les fichiers suplщmentaires" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Sщlectionner le rщpertoire des plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -959,6 +991,29 @@ msgstr "" "Le thшme que vous avez sщlectionщ ne support pas la langue franчaise. Si " "vous voulez l'utiliser vous devez d'abord changer de langue." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Supprimer" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1445,14 +1500,18 @@ msgstr "" msgid "Start anyway" msgstr "Jouer quand mъme" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Щmulateur MAME OPL" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Щmulateur DOSBox OPL" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1502,7 +1561,7 @@ msgstr "Pas de musique" msgid "Amiga Audio Emulator" msgstr "Щmulateur Amiga Audio" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Щmulateur AdLib" @@ -1774,9 +1833,8 @@ msgstr "Mode rapide" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Quitter" @@ -2136,14 +2194,13 @@ msgstr "Clic Dщsactivщ" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Dialogues sauvegarde/chargement d'origine" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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 " @@ -3443,39 +3500,46 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Utiliser les dialogues sauvegarde/chargement d'origine plutєt que ceux de " +"ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Activer le mode helium" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Activer le mode helium" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "Utiliser les curseurs argentщs au lieu des curseurs normaux dorщs" #~ msgid "EGA undithering" diff --git a/po/gl_ES.po b/po/gl_ES.po index a6a5365e42..cec2582c0a 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-02 09:51+0100\n" "Last-Translator: Santiago G. Sanz <s.sanz@uvigo.es>\n" "Language-Team: Santiago G. Sanz <s.sanz@uvigo.es>\n" @@ -30,7 +30,7 @@ msgstr "Funcionalidades compiladas:" msgid "Available engines:" msgstr "Motores dispoёibles:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Mostrar ficheiros ocultos" @@ -51,13 +51,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Arriba" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -65,10 +66,27 @@ msgstr "Arriba" msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Elixir" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nome:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -101,7 +119,7 @@ msgid "Map" msgstr "Asignar" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -163,10 +181,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nome:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Tэtulo completo do xogo" @@ -187,7 +201,7 @@ msgid "" msgstr "Idioma do xogo. Non converterс a versiѓn galega do xogo en inglesa" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<por defecto>" @@ -209,11 +223,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Efectos grсficos" @@ -226,7 +240,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Anular a configuraciѓn dos grсficos" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Son" @@ -239,11 +253,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Anular a configuraciѓn do son" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -257,7 +271,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Anular a configuraciѓn do volume" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -270,7 +284,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Anular a configuraciѓn de MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -283,11 +297,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Anular a configuraciѓn de MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Camiёos" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Camiёos" @@ -301,7 +315,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camiёo do xogo:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Camiёo adicional:" @@ -309,42 +323,42 @@ msgstr "Camiёo adicional:" msgid "Specifies path to additional data used by the game" msgstr "Especifica o camiёo dos datos adicionais usados no xogo" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Camiёo adicional:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Especifica o lugar dos ficheiros de gardado" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ningњn" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinido" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Seleccionar SoundFont" @@ -356,7 +370,7 @@ msgstr "Selecciona un directorio con datos de xogo" msgid "Select additional game directory" msgstr "Selecciona un directorio con datos adicionais" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Selecciona un directorio para ficheiros de gardado" @@ -553,6 +567,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Cambiar" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Modo rсpido" + #: gui/options.cpp:85 msgid "Never" msgstr "Nunca" @@ -593,8 +625,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ningunha" @@ -615,70 +647,70 @@ msgstr "non se puido cambiar a configuraciѓn de pantalla completa." msgid "the aspect ratio setting could not be changed" msgstr "non se puido cambiar a proporciѓn." -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grсficos:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Procesamento:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Modos de interpolaciѓn de cores compatibles con algњns xogos" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Correcciѓn de proporciѓn" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrixir a proporciѓn para os xogos en 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Dispositivo preferido:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica o dispositivo ou emulador de tarxeta de son preferido" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. mњsica:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Emulador de AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "Moitos xogos empregan AdLib para a mњsica" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -686,84 +718,84 @@ msgstr "" "A maior valor, maior calidade do son, mais talvez non sexa compatible coa " "tarxeta" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Dispositivo de GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 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:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Non empregar mњsica en General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Empregar o primeiro dispositivo dispoёible" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI mixto" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Empregar xeraciѓn de son MIDI e mсis AdLib" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Ganancia de MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Configuraciѓn de FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Dispositivo de MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 verdadeiro (sen emulaciѓn de GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 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:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 (sen emulaciѓn de GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (activar atribuciѓn MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -771,174 +803,174 @@ msgstr "" "Marcar para activar a atribuciѓn de parches e emular MT-32 nun dispositivo " "Roland GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Non empregar mњsica en Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Velocidade dos subtэtulos:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Mostrar os subtэtulos e reproducir as voces" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade subs:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Volume de mњsica:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Volume mњsica:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Silenciar todo" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Volume de efectos:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volume dos efectos de son" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume efectos:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Volume de voz:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voz:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Camiёo do tema:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Camiёo tema:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Camiёo dos complementos:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camiёo complementos:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Misc." -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Misc." -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Procesamento da interfaz:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Idioma de interfaz:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Idioma da interfaz de ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Non щ posible escribir no directorio elixido. Selecciona outro." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Seleccionar directorio para temas de interfaz" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Seleccionar directorio para ficheiros adicionais" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Seleccionar directorio para complementos" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -946,6 +978,29 @@ msgstr "" "O tema seleccionado non щ compatible co idioma actual. Para empregar o tema, " "deberсs cambiar antes o idioma da interfaz." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Eliminar" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1432,14 +1487,18 @@ msgstr "" msgid "Start anyway" msgstr "Iniciar de todos os xeitos" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Emulador de OPL de MAME" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Emulador de OPL de DOSBox" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1489,7 +1548,7 @@ msgstr "Sen mњsica" msgid "Amiga Audio Emulator" msgstr "Emulador de Amiga Audio" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Emulador de AdLib" @@ -1761,9 +1820,8 @@ msgstr "Modo rсpido" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Saэr" @@ -2121,14 +2179,13 @@ msgstr "Premer desactivado" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Empregar pantallas orixinais de gardado e carga" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3423,39 +3480,45 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Empregar as pantallas orixinais de gardado e carga, no canto das de ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Activar o modo helio" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Activar o modo helio" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Empregar o xogo de cursores prateados alternativo, no canto dos dourados " "normais" diff --git a/po/hu_HU.po b/po/hu_HU.po index 2121b0a100..ac48bd5e62 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-02-18 06:30+0100\n" "Last-Translator: George Kormendi <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" @@ -32,7 +32,7 @@ msgstr "Lefordэtott іsszetevѕk:" msgid "Available engines:" msgstr "Tсmogatott jсtщkmotorok:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Rejtett fсjlok lсtszanak" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Feljebb" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Feljebb" msgid "Cancel" msgstr "Mщgse" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Vсlaszt" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nщv:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Kiosztсs" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -164,10 +182,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nщv:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "A jсtщk teljes neve" @@ -189,7 +203,7 @@ msgstr "" "A jсtщk nyelve. Ne сllэtsd сt a pl. Spanyol nyelvћ jсtщkodat Angol nyelvre" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<alapщrtelmezett>" @@ -211,11 +225,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -228,7 +242,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Audiѓ" @@ -241,11 +255,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Hangerѕ" @@ -259,7 +273,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -272,7 +286,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -285,11 +299,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:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Mappсk" @@ -303,7 +317,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Extra Mappa:" @@ -311,42 +325,42 @@ msgstr "Extra Mappa:" msgid "Specifies path to additional data used by the game" msgstr "Mappa kivсlasztсs a jсtщkok kiegщszэtѕ fсjljaihoz" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Nincs" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Alapщrtelmezett" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "SoundFont kivсlasztсs" @@ -358,7 +372,7 @@ msgstr "Jсtщkok helyщnek kivсlasztсsa" msgid "Select additional game directory" msgstr "Vсlassz mappсt a jсtщk kiegщszэtѕkhіz" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Vсlaszz jсtщkmentщseknek mappсt" @@ -556,6 +570,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Kapcsol" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Gyors mѓd" + #: gui/options.cpp:85 msgid "Never" msgstr "Soha" @@ -596,8 +628,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Nincs" @@ -618,135 +650,135 @@ msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott" 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:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafikus mѓd:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Kirajzolсs mѓd:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 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:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Teljeskщpernyѕs mѓd:" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Kщpmщretarсny korrekciѓ" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Elsѕdleges eszkіz:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 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:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Elsѕdleges eszk.:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Kimeneti rсta:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 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:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM Eszkіz:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Ne hasznсlj General MIDI zenщt" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Vegyes AdLib/MIDI mѓd" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI erѕsэtщs:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth Beсllэtсsa" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 Eszkіz:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -754,16 +786,16 @@ msgstr "" "Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a " "gщpedhez щs hasznсlni akarod" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS eszkіz (MT-32 mapping engedщlyezщs)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -771,173 +803,173 @@ msgstr "" "Ellenѕrzщs ha engedщlyezni akarod az emulсlt MT-32 Folt lekщpezщst a Roland " "GS eszkіzіn" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Ne hasznсlj Roland MT-32 zenщt" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Szіveg щs beszщd:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Csak beszщd" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Csak felirat" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Mind" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Felirat щs beszщd:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Besz" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Text" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Mind" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Hang щs feliratok megjelenэtщse" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "жsszes nщmэtсsa" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Speciсlis hangeffektusok hangereje" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tщma:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI Renderelѕ:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Billentyћk" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "GUI nyelve:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "A ScummVM GUI nyelve" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "GUI tщma mappa kivсlasztсsa" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Mappa vсlasztсs az extra fсjloknak" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Plugin mappa kivсlasztсsa" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -945,6 +977,29 @@ msgstr "" "A kivсlasztott tщma nem tсmogatja a nyelvedet. Ha hasznсlni akarod ezt a " "tщmсt, elѕszѕr vсlts сt egy mсsik nyelvre." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Tіrіl" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1428,14 +1483,18 @@ msgstr "" msgid "Start anyway" msgstr "Indэtсs эgy is" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emulсtor" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulсtor" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1483,7 +1542,7 @@ msgstr "Nincs zene" msgid "Amiga Audio Emulator" msgstr "Amiga Audiѓ Emulсtor" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib Emulсtor" @@ -1755,9 +1814,8 @@ msgstr "Gyors mѓd" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Kilщpщs" @@ -2113,14 +2171,13 @@ msgstr "Kattintсs tiltva" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Eredeti ment/tіlt kщpernyѕk hasznсlata" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3406,39 +3463,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "Az eredeti mentщs/betіltщs kщpernyѕ hasznсlata a ScummVM kщpek helyett" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Helium mѓd engedщlyezve" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Helium mѓd engedщlyezve" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "Alternatэv ezќst kurzorszett hasznсlata, a normсl arany helyett" #~ msgid "EGA undithering" diff --git a/po/it_IT.po b/po/it_IT.po index 5dfa8039b4..28ec2960db 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-03 17:59-0600\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" @@ -29,7 +29,7 @@ msgstr "Funzionalitр incluse:" msgid "Available engines:" msgstr "Motori disponibili:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Mostra file nascosti" @@ -50,13 +50,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Su" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -64,10 +65,27 @@ msgstr "Su" msgid "Cancel" msgstr "Annulla" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Scegli" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nome:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -100,7 +118,7 @@ msgid "Map" msgstr "Mappa" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -162,10 +180,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nome:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Titolo completo del gioco" @@ -187,7 +201,7 @@ msgstr "" "Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<predefinito>" @@ -209,11 +223,11 @@ msgstr "Piattaf.:" msgid "Engine" msgstr "Motore" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafica" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Grafica" @@ -226,7 +240,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Audio" @@ -239,11 +253,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -257,7 +271,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -270,7 +284,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -283,11 +297,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Percorsi" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Perc." @@ -301,7 +315,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Perc. gioco:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Percorso extra:" @@ -309,42 +323,42 @@ msgstr "Percorso extra:" msgid "Specifies path to additional data used by the game" msgstr "Specifica il percorso di ulteriori dati usati dal gioco" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Perc. extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Salvataggi:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Specifica dove archiviare i salvataggi" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Salvataggi:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Nessuno" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinito" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Seleziona SoundFont" @@ -356,7 +370,7 @@ msgstr "Seleziona la cartella contenente i file di gioco" msgid "Select additional game directory" msgstr "Seleziona la cartella di gioco aggiuntiva" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Seleziona la cartella dei salvataggi" @@ -557,6 +571,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Sposta" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Modalitр veloce" + #: gui/options.cpp:85 msgid "Never" msgstr "Mai" @@ -597,8 +629,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Nessuno" @@ -619,72 +651,72 @@ msgstr "impossibile modificare l'impostazione schermo intero" msgid "the aspect ratio setting could not be changed" msgstr "impossibile modificare l'impostazione proporzioni" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Modalitр:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Resa grafica:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Modalitр a schermo intero" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Correzione proporzioni" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregge le proporzioni dei giochi 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Disp. preferito:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Dispositivo audio:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Specifica il dispositivo audio o l'emulatore della scheda audio preferiti" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferito:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Disposit. audio:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Emulatore AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib ш utilizzato per la musica in molti giochi" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Frequenza:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -692,66 +724,66 @@ msgstr "" "Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non " "essere supportati dalla tua scheda audio" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Non utilizzare la musica General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Utilizza il primo dispositivo disponibile" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont ш supportato da alcune schede audio, FluidSynth e Timidity" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Modalitр mista AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilizza generazione di suono sia MIDI che AdLib" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Guadagno MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Impostazioni FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -759,16 +791,16 @@ msgstr "" "Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland " "che ш connesso al tuo computer" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 effettivo (disat.emul.GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (attiva mappature MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -776,173 +808,173 @@ msgstr "" "Seleziona se vuoi attivare le mappature per emulare un MT-32 su un " "dispositivo Roland GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Non utilizzare la musica Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Voci" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Sottotitoli" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Entrambi" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Voci" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Sub" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Entr." -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Mostra i sottotitoli e attiva le voci" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Disattiva audio" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volume degli effetti sonori" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Percorso tema:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Perc. tema:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Percorso plugin:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Perc. plugin:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Renderer GUI:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Tasti" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Lingua GUI:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Lingua dell'interfaccia grafica di ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Devi riavviare ScummVM affinchщ le modifiche abbiano effetto." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Seleziona la cartella dei temi dell'interfaccia" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Seleziona la cartella dei file aggiuntivi" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Seleziona la cartella dei plugin" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -950,6 +982,29 @@ msgstr "" "Il tema che hai selezionato non supporta la lingua attuale. Se vuoi " "utilizzare questo tema devi prima cambiare la lingua." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Elimina" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1439,14 +1494,18 @@ msgstr "" msgid "Start anyway" msgstr "Avvia comunque" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Emulatore OPL MAME" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Emulatore OPL DOSBox" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1496,7 +1555,7 @@ msgstr "Nessuna musica" msgid "Amiga Audio Emulator" msgstr "Emulatore audio Amiga" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Emulatore AdLib" @@ -1768,9 +1827,8 @@ msgstr "Modalitр veloce" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Esci" @@ -2128,14 +2186,13 @@ msgstr "Clic disattivato" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Usa schermate di salvataggio originali" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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 " @@ -3431,39 +3488,46 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Usa le schermate originali di salvataggio e caricamento, al posto di quelle " +"di ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Attiva la modalitр elio" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Attiva la modalitр elio" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Usa il set alternativo di cursori d'argento al posto di quelli normali d'oro" diff --git a/po/nb_NO.po b/po/nb_NO.po index 1c73957a54..0b2816ad2f 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-11 00:02+0100\n" "Last-Translator: Einar Johan Trјan Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -32,7 +32,7 @@ msgstr "Funksjoner innkompilert:" msgid "Available engines:" msgstr "Tilgjengelige motorer:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Vis skjulte filer" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Oppover" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Oppover" msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Velg" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Navn:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Koble" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Navn:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Full spilltittel" @@ -191,7 +205,7 @@ msgstr "" "versjon" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -213,11 +227,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -230,7 +244,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Lyd" @@ -243,11 +257,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -261,7 +275,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -274,7 +288,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -287,11 +301,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Sti" @@ -305,7 +319,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -313,42 +327,42 @@ msgstr "Ekstrasti:" msgid "Specifies path to additional data used by the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Velg SoundFont" @@ -360,7 +374,7 @@ msgstr "Velg mappe med spilldata" msgid "Select additional game directory" msgstr "Velg mappe med ytterligere data" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Velg mappe for lagrede spill" @@ -560,6 +574,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Bytt" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Rask modus" + #: gui/options.cpp:85 msgid "Never" msgstr "Aldri" @@ -600,8 +632,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ingen" @@ -622,70 +654,70 @@ msgstr "fullskjermsinnstillingen kunne ikke endres" msgid "the aspect ratio setting could not be changed" msgstr "aspektrate-innstillingen kunne ikke endres" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stјttet av enkelte spill" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Aspekt-rate korrigering" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Korriger aspekt-rate for 320x200-spill" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Foretrukket enhet:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretrukket enh.:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -693,64 +725,64 @@ msgstr "" "Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt " "lydkort " -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Velger standard lydenhet for General MIDI-utdata" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Bruk fјrste tilgjengelige enhet" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Mikset AdLib/MIDI-modus" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Bruk bхde MIDI- og AdLib- lydgenerering" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth-instillinger" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 Enhet:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -758,188 +790,188 @@ msgstr "" "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " "vil bruke dette." -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Modus (aktiver MT32-mapping)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Ikke bruk Roland MT-32-musikk" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Begge" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Teksthastighet:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Vis undertekster, og spill av tale" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Underteksthastighet:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI-tegner:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Velg mappe for GUI-temaer" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Velg mappe for ytterligere filer" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Velg mappe for plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -947,6 +979,29 @@ msgstr "" "Temaet du valgte stјtter ikke det aktive sprхket. Hvis du vil bruke dette " "temaet, mх du bytte til et annet sprхk fјrst." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Slett" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1432,14 +1487,18 @@ msgstr "" msgid "Start anyway" msgstr "Start allikevel" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1489,7 +1548,7 @@ msgstr "Ingen musikk" msgid "Amiga Audio Emulator" msgstr "Amiga Lydemulator" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib Emulator" @@ -1761,9 +1820,8 @@ msgstr "Rask modus" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Avslutt" @@ -2122,14 +2180,13 @@ msgstr "Klikking deaktivert" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Bruk originale lagre/laste-skjermer" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" @@ -3413,39 +3470,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Aktiver helium-modus" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Aktiver helium-modus" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Bruk det alternative settet med sјlvmuspekere, istedenfor de normale gylne." diff --git a/po/nl_NL.po b/po/nl_NL.po index 970ff6ce8b..0cca1a004e 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-11-25 20:46+0100\n" "Last-Translator: Ben Castricum <scummvm@bencastricum.nl>\n" "Language-Team: Ben Castricum <scummvm@bencastricum.nl>\n" @@ -32,7 +32,7 @@ msgstr "Features meegecompileerd:" msgid "Available engines:" msgstr "Beschikbare engines:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Toon verborgen bestanden" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Ga omhoog" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Ga omhoog" msgid "Cancel" msgstr "Annuleren" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Selecteer" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Naam:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Koppel" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Naam:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Volledige titel van het spel" @@ -191,7 +205,7 @@ msgstr "" "Nederlandse." #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<standaard>" @@ -213,11 +227,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Engine" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Beeld" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -230,7 +244,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Negeer algemene grafische instellingen" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Geluid" @@ -243,11 +257,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Negeer algemene audio instellingen" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -261,7 +275,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Negeer algemene volume instellingen" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -274,7 +288,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Negeer algemene MIDI instellingen" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -287,11 +301,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Negeer algemene MT-32 instellingen" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Paden" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Paden" @@ -305,7 +319,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spel Pad:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Extra Pad:" @@ -313,42 +327,42 @@ msgstr "Extra Pad:" msgid "Specifies path to additional data used by the game" msgstr "Specificeer pad naar additionele data voor het spel" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Pad:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Bewaar Pad:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Bepaalt waar opgeslagen spellen worden bewaard." -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Bewaar Pad:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Geen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standaard" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Selecteer SoundFont" @@ -360,7 +374,7 @@ msgstr "Selecteer map met speldata" msgid "Select additional game directory" msgstr "Selecteer additionele speldatamap" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Selecteer map voor opgeslagen spellen" @@ -565,6 +579,24 @@ msgstr "" "%d nieuwe spellen ontdekt, %d spellen die al eerder waren toegevoegd " "genegeerd ..." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Schakel" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Snelle modus" + #: gui/options.cpp:85 msgid "Never" msgstr "Nooit" @@ -605,8 +637,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Geen" @@ -627,70 +659,70 @@ msgstr "de volledig-scherminstelling kon niet veranderd worden" msgid "the aspect ratio setting could not be changed" msgstr "de pixelverhoudinginstelling kon niet veranderd worden" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafische modus:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Render modus:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Speciale ditheringmodi die door sommige games ondersteund worden." -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Volledig-scherm modus" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Pixelverhoudingcorrectie" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrigeer de pixelverhouding voor 320x200 spellen." -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Voorkeursapparaat:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Muziekapparaat:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Specificeert het voorkeurs geluidsapparaat of geluidskaartemulator" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Specificeert geluidsapparaat of geluidskaartemulator" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Voorkeursapparaat:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Muziekapparaat:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib word in vele spelen voor muziek gebruikt" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Output snelheid:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -698,67 +730,67 @@ msgstr "" "Hogere waarden geven betere geluidskwaliteit maar worden mogelijk niet " "ondersteund door uw geluidskaart." -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM Apparaat:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Specificeert het standaard geluidsapparaat voor General MIDI" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Geen General MIDI muziek gebruiken" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Gebruik eerst beschikbare apparaat" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont wordt ondersteund door FluidSynth en Timidity en sommige " "geluidskaarten." -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Gemengde AdLib/MIDI modus" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Gebruik zowel MIDI als AdLib geluid" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth Instellingen" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 Apparaat:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Specificeert het standaard geluidsapparaat voor Roland MT-32/LAPC1/CM32l/CM64" -#: gui/options.cpp:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Waarheidsgetrouwe Roland MT-32 (GM emulatie uitschakelen)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -766,16 +798,16 @@ msgstr "" "Selecteer als u een hardware Roland-compatible geluidsapparaat gekoppeld aan " "uw computer wilt gebruiken" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland MT-32 (geen GM emulatie)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Device (met MT-32 mappings)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -783,175 +815,175 @@ msgstr "" "Selecteer dit als u patchmappings wilt om een MT-32 op een Roland GS " "apparaat te emuleren." -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Geen Roland MT-32 muziek gebruiken" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Spraak en/of tekst:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Spraak" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Tekst" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Beide" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Snelheid tekst:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Spraak en/of text:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Sprk" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Text" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Beide" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Toon tekst en speel spraak af" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Snelheid text:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Muziek volume:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Muziek volume:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Alles Dempen" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "SFX volume:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volume voor speciale geluidseffecten" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX volume:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Spraak volume:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Spraak volume:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Thema Pad:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Thema Pad:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Specificeert het pad for aanvullende data voor ScummVM zelf of de spellen." -#: gui/options.cpp:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Plugins Pad:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins Pad:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI Renderer:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autosave:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autosave:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Toetsen" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "GUI Taal:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Taal van de ScummVM GUI" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "U dient ScummVM opnieuw op te starten om de wijzigingen te activeren." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "Er kan niet worden geschreven in de gekozen map. Selecteer a.u.b. een andere." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Selecteer map voor GUI themas" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Selecteer map voor extra bestanden" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Selecteer map voor plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -959,6 +991,29 @@ msgstr "" "De thema die u heeft geselecteerd ondersteund uw gekozen taal niet. Als u " "dit thema wilt gebruiken dient u eerst een andere taal te selecteren." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Verwijderen" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1449,14 +1504,18 @@ msgstr "" msgid "Start anyway" msgstr "Evengoed starten" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1506,7 +1565,7 @@ msgstr "Geen muziek" msgid "Amiga Audio Emulator" msgstr "Amiga Audio Emulator" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib Emulator" @@ -1778,9 +1837,8 @@ msgstr "Snelle modus" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Stoppen" @@ -2140,14 +2198,13 @@ msgstr "Klikken Uitgeschakeld" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Gebruik originele opslaan/laad schermen" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Gebruik de originele opslaan/laden schermen, in plaats van die van ScummVM" @@ -3458,39 +3515,45 @@ msgstr "Toon FPS-teller" msgid "Show the current number of frames per second in the upper left corner" msgstr "Toon de huidige Frames Per Second teller in de linkerbovenhoek" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Gebruik de originele opslaan/laden schermen, in plaats van die van ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Helium-modus aangezet" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Helium-modus aangezet" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Gebruik de alternative set van zilveren cursors, in plaats van de normale " "gouden" diff --git a/po/nn_NO.po b/po/nn_NO.po index 2741620b8e..35f461e6d2 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-11 00:04+0100\n" "Last-Translator: Einar Johan Trјan Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -32,7 +32,7 @@ msgstr "Funksjonar innkompilert:" msgid "Available engines:" msgstr "Tilgjengelege motorar:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Vis skjulte filer" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Oppover" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Oppover" msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Vel" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Namn:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Kople" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Namn:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Full speltittel:" @@ -191,7 +205,7 @@ msgstr "" "engelsk versjon" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -213,11 +227,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -230,7 +244,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Lyd" @@ -243,11 +257,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -261,7 +275,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -274,7 +288,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -287,11 +301,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Stiar" @@ -305,7 +319,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -313,42 +327,42 @@ msgstr "Ekstrasti:" msgid "Specifies path to additional data used by the game" msgstr "" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Vel SoundFont" @@ -361,7 +375,7 @@ msgstr "Vel mappe med speldata" msgid "Select additional game directory" msgstr "Vel mappe med speldata" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Vel mappe for lagra spel" @@ -558,6 +572,24 @@ msgstr "Sјkt i %d mappar ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Oppdaga %d nye spel ..." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Bytt" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Rask modus" + #: gui/options.cpp:85 msgid "Never" msgstr "Aldri" @@ -598,8 +630,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ingen" @@ -620,72 +652,72 @@ msgstr "Fullskjerminstillinga kunne ikkje endrast" msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Teiknemodus:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som stјttast av nokre spel" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Aspekt-korrigering" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Rett opp aspekt for 320x200 spel" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musikkeining:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:773 +#: gui/options.cpp:771 #, fuzzy msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 #, fuzzy msgctxt "lowres" msgid "Music Device:" msgstr "Ingen musikk" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib nyttast til musikk i mange spel" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -693,252 +725,252 @@ msgstr "" "Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av " "lydkortet ditt" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM Eining:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Ikkje nytt General MIDI musikk" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Nytt fјrste tilgjengelege eining" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont stјttast av enkelte lydkort, FluidSynth og Timidity" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Blanda AdLib/MIDI-modus" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Nytt bхe MIDI og AdLib lydskaping" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth instillingar" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 Eining:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (ingen GS-emulering)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Ikkje nytt Roland MT-32 musikk" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Teksting" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Begge" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Bхe" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Vis teksting og spel av tale" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI-teiknar:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Tastar" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mх starte ScummVM pх nytt for at endringane skal tre i kraft." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Vel ei mappe for GUI-tema:" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Vel ei mappe for plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -946,6 +978,29 @@ msgstr "" "Temaet du har valt stјttar ikkje det aktive sprхket. Om du vil nytte dette " "temaet mх du bytte til eit anna sprхk fјrst." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Slett" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1415,14 +1470,18 @@ msgstr "" msgid "Start anyway" msgstr "Start allikevel" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1464,7 +1523,7 @@ msgstr "Ingen musikk" msgid "Amiga Audio Emulator" msgstr "Amiga Lydemulator" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib Emulator" @@ -1743,9 +1802,8 @@ msgstr "Rask modus" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Avslutt" @@ -2116,14 +2174,13 @@ msgstr "Klikking Deaktivert" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Nytt opprinnelege skjermar for lagring/lasting" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -3381,39 +3438,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "Nytt opprinnelege skjermar for lagring/lasting" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Grafikkmodus:" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Grafikkmodus:" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "Nytt det alternative settet med sјlvpeikarar, istaden for dei gylne" #~ msgctxt "lowres" diff --git a/po/pl_PL.po b/po/pl_PL.po index c131023dfc..233fa02599 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-02 12:28+0100\n" "Last-Translator: MichaГ ZiБbkowski <mziab@o2.pl>\n" "Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n" @@ -33,7 +33,7 @@ msgstr "Wkompilowane funkcje:" msgid "Available engines:" msgstr "Dostъpne silniki:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "PokaП ukryte pliki" @@ -54,13 +54,14 @@ msgctxt "lowres" msgid "Go up" msgstr "W gѓrъ" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -68,10 +69,27 @@ msgstr "W gѓrъ" msgid "Cancel" msgstr "Anuluj" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Wybierz" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nazwa:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -104,7 +122,7 @@ msgid "Map" msgstr "Przypisz" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -166,10 +184,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nazwa:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "PeГny tytuГ gry:" @@ -190,7 +204,7 @@ msgid "" msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ." #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<domyЖlne>" @@ -212,11 +226,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Silnik" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Grafika" @@ -229,7 +243,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "DМwiъk" @@ -242,11 +256,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "GГoЖnoЖц" @@ -260,7 +274,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -273,7 +287,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -286,11 +300,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "ІcieПki" @@ -304,7 +318,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Іc. dodatkѓw:" @@ -312,42 +326,42 @@ msgstr "Іc. dodatkѓw:" msgid "Specifies path to additional data used by the game" msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "OkreЖla gdzie zapisywaц stan gry" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Brak" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "DomyЖlnie" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Wybierz SoundFont" @@ -359,7 +373,7 @@ msgstr "Wybierz katalog z plikami gry" msgid "Select additional game directory" msgstr "Wybierz dodatkowy katalog gry" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Wybierz katalog dla zapisѓw" @@ -555,6 +569,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "PrzeГБcz" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Tryb szybki" + #: gui/options.cpp:85 msgid "Never" msgstr "Nigdy" @@ -595,8 +627,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Brak" @@ -617,70 +649,70 @@ msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego" msgid "the aspect ratio setting could not be changed" msgstr "nie udaГo siъ zmieniц formatu obrazu" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Tryb grafiki:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Renderer:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "PeГny ekran" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Korekcja formatu obrazu" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Korekcja formatu obrazu dla gier 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 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:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Emulator AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib jest uПywany do muzyki w wielu grach" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Czъst. wyj.:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -688,67 +720,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:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "UrzБdzenie GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 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:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Nie uПywaj muzyki General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "UПyj pierwszego dostъpnego urzБdzenia" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Tryb miksowanego AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 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:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Wzm. MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Ustawienia FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "UrzБdzenie MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -756,16 +788,16 @@ msgstr "" "Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland " "podГБczonej do twojego komputera" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland w trybie GS (wГБcz mapowanie MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -773,173 +805,173 @@ msgstr "" "Zaznacz, jeЖli chcesz wГБczyц Гatki mapowania pozwalajБce na emulacjъ MT-32 " "na urzБdzeniu Roland GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Nie uПywaj muzyki Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Mowa" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Napisy" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Oba" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Mowa" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Napisy" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "WyЖwietlaj napisy i odtwarzaj mowъ" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Wycisz" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "GГoЖnoЖц efektѓw dМw." -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Styl:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Renderer interf.:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Klawisze" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Jъzyk interfejsu:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Jъzyk interfejsu ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Wybierz katalog dla stylѓw GUI." -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Wybierz katalog dla dodatkowych plikѓw" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Wybierz katalog dla wtyczek" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -947,6 +979,29 @@ msgstr "" "Wybrany styl nie obsГuguje obecnego jъzyka. JeЖli chcesz go uПywaц, zmieё " "najpierw swѓj jъzyk." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Skasuj" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1427,14 +1482,18 @@ msgstr "" msgid "Start anyway" msgstr "WГБcz mimo tego" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Emulator OPL MAME" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Emulator OPL DOSBox" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1484,7 +1543,7 @@ msgstr "Brak muzyki" msgid "Amiga Audio Emulator" msgstr "Emulator dМwiъku Amigi" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Emulator AdLib" @@ -1756,9 +1815,8 @@ msgstr "Tryb szybki" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Zakoёcz" @@ -2114,14 +2172,13 @@ msgstr "Klikanie wyГБczone" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu zamiast tych ze ScummVM" @@ -3411,39 +3468,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu zamiast tych ze ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "WГБcz tryb helowy" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "WГБcz tryb helowy" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "UПyj alternatywnego zestawu srebrnych kursorѓw zamiast zwykГych zГotych" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8280b28154..dae84f8e09 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\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,7 +33,7 @@ msgstr "Funчѕes compiladas em:" msgid "Available engines:" msgstr "Programas disponэveis:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 #, fuzzy msgid "Show hidden files" msgstr "Mostrar / Ocultar console" @@ -55,13 +55,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Acima" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -69,10 +70,27 @@ msgstr "Acima" msgid "Cancel" msgstr "Cancelar" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Escolher" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Nome:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -106,7 +124,7 @@ msgid "Map" msgstr "Mapear" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -168,10 +186,6 @@ msgctxt "lowres" msgid "ID:" msgstr "Cѓdigo:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Nome:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Tэtulo completo do jogo" @@ -192,7 +206,7 @@ msgid "" msgstr "Idioma do jogo. Isto nуo irс passar seu jogo Inglъs para Portuguъs" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<padrуo>" @@ -215,11 +229,11 @@ msgstr "Sistema:" msgid "Engine" msgstr "Examinar" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -232,7 +246,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Сudio" @@ -245,11 +259,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -263,7 +277,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -276,7 +290,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -289,11 +303,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Pastas" @@ -307,7 +321,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Pasta de Extras" @@ -315,42 +329,42 @@ msgstr "Pasta de Extras" msgid "Specifies path to additional data used by the game" msgstr "Especifique a pasta para dados utilizados no jogo" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Pasta para Salvar" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Pasta para Salvar" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Nenhum(a)" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Selecione o SoundFont" @@ -362,7 +376,7 @@ msgstr "Selecione a pasta com os arquivos do jogo" msgid "Select additional game directory" msgstr "Selecione a pasta adicional do jogo" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Selecione a pasta para os jogos salvos" @@ -567,6 +581,24 @@ msgstr "" "Encontrado(s) %d novo(s) jogo(s, ignorados %d previamente adicionados " "jogos..." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Trocar" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Modo rсpido" + #: gui/options.cpp:85 msgid "Never" msgstr "Nunca" @@ -607,8 +639,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Nenhum(a)" @@ -629,70 +661,70 @@ msgstr "a configuraчуo de tela cheia nуo pєde ser mudada" 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:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Renderizaчуo" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Correчуo de proporчуo" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Correчуo de proporчуo para jogos 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 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:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 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:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib щ utilizado para mњsica em vсrios jogos" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -700,66 +732,66 @@ msgstr "" "Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado " "por sua placa de som" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 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:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Nуo usar mњsica General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Usar o primeiro dispositivo disponэvel" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Mixar AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar MIDI e AdLib juntos na geraчуo de som" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Ganho MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Dispositivo MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -767,191 +799,191 @@ msgstr "" "Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel " "com Roland" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sem emulaчуo GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Nуo usar mњsica Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Legendas" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Rapidez legendas:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Legs" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Mostrar legenda e vozes (dublagem)" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade das legendas:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Mudo" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volume dos efeitos sonoros especiais" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Renderizador GUI:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Idioma do GUI:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Linguagem do ScummVM GUI" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Vocъ tem que reiniciar o ScummVM para funcionar." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Selecione a pasta para os plugins" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -959,6 +991,29 @@ msgstr "" "O tema que vocъ selecionou nуo suporta seu idioma atual. Se vocъ quiser usar " "este tema vocъ precisa mudar para outro idioma." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Excluir" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1458,14 +1513,18 @@ msgstr "" msgid "Start anyway" msgstr "Iniciar de qualquer maneira" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Emulador MAME OPL" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Emulador DOSBox OPL" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1515,7 +1574,7 @@ msgstr "Sem mњsica" msgid "Amiga Audio Emulator" msgstr "Emulador Som Amiga" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Emulador AdLib" @@ -1790,9 +1849,8 @@ msgstr "Modo rсpido" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Sair" @@ -2152,14 +2210,13 @@ msgstr "Clicando Desabilitado" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -3465,38 +3522,42 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Ligar modo Roland GS" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Ligar modo Roland GS" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +#: engines/zvision/detection_tables.h:92 +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" #~ msgid "EGA undithering" diff --git a/po/ru_RU.po b/po/ru_RU.po index 066333bbb5..6941d5773a 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-02 17:20+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" @@ -32,7 +32,7 @@ msgstr "Включённые в билд опции:" msgid "Available engines:" msgstr "Доступные движки:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Показать скрытые файлы" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Вверх" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Вверх" msgid "Cancel" msgstr "Отмена" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Выбрать" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Название:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Назначить" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Название:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Полное название игры" @@ -190,7 +204,7 @@ msgstr "" "Язык игры. Изменение этой настройки не превратит игру на английском в русскую" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<по умолчанию>" @@ -212,11 +226,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Графика" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Грф" @@ -229,7 +243,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Аудио" @@ -242,11 +256,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Громкость" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Громк" @@ -260,7 +274,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -273,7 +287,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -286,11 +300,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Пути" @@ -304,7 +318,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Где игра:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Доп. путь:" @@ -312,42 +326,42 @@ msgstr "Доп. путь:" msgid "Specifies path to additional data used by the game" msgstr "Указывает путь к дополнительным файлам данных для игры" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Сохранения игр:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Указывает путь к сохранениям игры" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Путь сохр:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Не задан" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "По умолчанию" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Выберите SoundFont" @@ -359,7 +373,7 @@ msgstr "Выберите директорию с файлами игры" msgid "Select additional game directory" msgstr "Выберите дополнительную директорию игры" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Выберите директорию для сохранений" @@ -556,6 +570,24 @@ msgstr "Просмотрено %d директорий ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Найдено %d новых игр, пропущено %d ранее добавленных игр ..." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Переключить" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Быстрый режим" + #: gui/options.cpp:85 msgid "Never" msgstr "Никогда" @@ -596,8 +628,8 @@ msgstr "44 кГц" msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Не задан" @@ -618,71 +650,71 @@ msgstr "полноэкранный режим не может быть изменён" msgid "the aspect ratio setting could not be changed" msgstr "режим корректировки соотношения сторон не может быть изменён" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Граф. режим:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Режим растра:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Полноэкранный режим" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Коррекция соотношения сторон" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Корректировать соотношение сторон для игр с разрешением 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Предпочитаемое:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Предпочитаемое:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Эмулятор AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "Звуковая карта AdLib используется многими играми" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Частота звука:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -690,68 +722,68 @@ msgstr "" "БОльшие значения задают лучшее качество звука, однако они могут не " "поддерживаться вашей звуковой картой" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Устройство GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Указывает выходное звуковое устройство для MIDI" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Не использовать музыку для General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Использовать первое доступное устройство" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont'ы поддерживаются некоторыми звуковыми картами, FluidSynth и " "Timidity" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Смешанный режим AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Использовать и MIDI, и AdLib для генерации звука" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Усиление MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Настройки FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Устр. MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Указывает звуковое устройство по умолчанию для вывода на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -759,16 +791,16 @@ msgstr "" "Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы " "хотите его использовать" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Настоящий Roland MT-32 (без эмуляции GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Устройство Roland GS (разрешить маппинг MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -776,175 +808,175 @@ msgstr "" "Отметьте, если хотите разрешить маппинг для эмуляции MT-32 на устройстве " "Roland GS" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Не использовать музыку для MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Субтитры" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Оба" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Оба" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Показывать субтитры и воспроизводить речь" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Выкл. всё" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Громкость SFX:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Громкость специальных звуковых эффектов" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Громк. SFX:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Путь к темам:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Где темы:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Указывает путь к дополнительным файлам данных, используемых всеми играми, " "либо ScummVM" -#: gui/options.cpp:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Рисовалка GUI:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Автосохранение:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Автосохр.:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Клавиши" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Язык GUI:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Язык графического интерфейса ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы должны перезапустить ScummVM, чтобы применить изменения." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Выберите директорию для тем GUI" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Выберите директорию с дополнительными файлами" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Выберите директорию с плагинами" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -952,6 +984,29 @@ msgstr "" "Тема, выбранная вами, не поддерживает текущий язык. Если вы хотите " "использовать эту тему, вам необходимо сначала переключиться на другой язык." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Удалить" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1441,14 +1496,18 @@ msgstr "" msgid "Start anyway" msgstr "Всё равно запустить" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Эмулятор MAME OPL" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Эмулятор DOSBox OPL" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1498,7 +1557,7 @@ msgstr "Без музыки" msgid "Amiga Audio Emulator" msgstr "Эмулятор звука Amiga" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Эмулятор AdLib" @@ -1770,9 +1829,8 @@ msgstr "Быстрый режим" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Выход" @@ -2128,14 +2186,13 @@ msgstr "Щелчки выключены" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Использовать оригинальные экраны записи/чтения игры" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Использовать оригинальные экраны записи и сохранения игры вместо сделанных в " @@ -3430,39 +3487,46 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Использовать оригинальные экраны записи и сохранения игры вместо сделанных в " +"ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Включить режим гелия" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Включить режим гелия" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Использовать альтернативный набор серебряных курсоров вместо обычных золотых" diff --git a/po/scummvm.pot b/po/scummvm.pot index 49689e914b..7036c41f91 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\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,7 +30,7 @@ msgstr "" msgid "Available engines:" msgstr "" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "" @@ -51,13 +51,14 @@ msgctxt "lowres" msgid "Go up" msgstr "" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -65,10 +66,27 @@ msgstr "" msgid "Cancel" msgstr "" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -101,7 +119,7 @@ msgid "Map" msgstr "" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -161,10 +179,6 @@ msgctxt "lowres" msgid "ID:" msgstr "" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "" @@ -185,7 +199,7 @@ msgid "" msgstr "" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "" @@ -207,11 +221,11 @@ msgstr "" msgid "Engine" msgstr "" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "" @@ -224,7 +238,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "" @@ -237,11 +251,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "" @@ -255,7 +269,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "" @@ -268,7 +282,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "" @@ -281,11 +295,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "" @@ -299,7 +313,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "" @@ -307,42 +321,42 @@ msgstr "" msgid "Specifies path to additional data used by the game" msgstr "" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "" @@ -354,7 +368,7 @@ msgstr "" msgid "Select additional game directory" msgstr "" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "" @@ -549,6 +563,22 @@ msgstr "" msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +msgid "Switch to Game" +msgstr "" + +#: gui/onscreendialog.cpp:110 +msgid "Fast replay" +msgstr "" + #: gui/options.cpp:85 msgid "Never" msgstr "" @@ -589,8 +619,8 @@ msgstr "" msgid "48 kHz" msgstr "" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "" @@ -611,325 +641,347 @@ msgstr "" msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "" -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." msgstr "" +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +msgid "Delete char" +msgstr "" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1391,14 +1443,18 @@ msgstr "" msgid "Start anyway" msgstr "" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1440,7 +1496,7 @@ msgstr "" msgid "Amiga Audio Emulator" msgstr "" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "" @@ -1712,9 +1768,8 @@ msgstr "" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "" @@ -2068,14 +2123,13 @@ msgstr "" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -3295,35 +3349,38 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 msgid "Enable Venus" msgstr "" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 msgid "Enable the Venus help system" msgstr "" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +#: engines/zvision/detection_tables.h:92 +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" diff --git a/po/se_SE.po b/po/se_SE.po index d49cf3606a..b74f82805c 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: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-02 16:30+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" @@ -32,7 +32,7 @@ msgstr "Funktioner kompilerade i:" msgid "Available engines:" msgstr "Tillgфngliga motorer" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Visa gіmda filer" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Uppхt" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Uppхt" msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Vфlj" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Namn:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Stфll in" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Namn:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Spelets fullstфndiga titel" @@ -191,7 +205,7 @@ msgstr "" "till en engelsk" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -213,11 +227,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "GFX" @@ -230,7 +244,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Ljud" @@ -243,11 +257,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Volym" @@ -261,7 +275,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -274,7 +288,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -287,11 +301,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Sіkvфgar" @@ -305,7 +319,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Sіkv. extra:" @@ -313,42 +327,42 @@ msgstr "Sіkv. extra:" msgid "Specifies path to additional data used by the game" msgstr "Bestфmmer sіkvфgen till ytterligare data som spelet anvфnder" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Bestфmmer var dina spardata lagras" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Vфlj SoundFont" @@ -360,7 +374,7 @@ msgstr "Vфlj katalog med speldata" msgid "Select additional game directory" msgstr "Vфlj en ytterligare spelkatalog" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Vфlj katalog fіr spardata" @@ -558,6 +572,24 @@ 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/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Byt" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Snabblфge" + #: gui/options.cpp:85 msgid "Never" msgstr "Aldrig" @@ -598,8 +630,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Ingen" @@ -620,70 +652,70 @@ msgstr "fullskфrmsinstфllningen kunde inte фndras." msgid "the aspect ratio setting could not be changed" msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras." -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Grafiklфge:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Renderingslфge:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlфgen stіdda av vissa spel" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Fullskфrmslфge" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Korrektion av bildfіrhхllande" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrigerar bildfіrhхllanden fіr 320x200-spel" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Fіredragen enhet:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fіredr. enhet:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "AdLib anvфnds fіr musik i mхnga spel" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Ljudfrekvens:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -691,65 +723,65 @@ msgstr "" "Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt " "ljudkort" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Anvфnd inte General MIDI-musik" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Anvфnd fіrsta tillgфngliga enhet" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 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:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Blandat AdLib/MIDI-lфge" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "FluidSynth instфllningar" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "MT-32 enhet:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 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:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -757,16 +789,16 @@ msgstr "" "Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-" "anslutna ljudenhet" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Фkta Roland MT-32 (ingen GM-emulation)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS-enhet (aktivera MT-32 mappings)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -774,175 +806,175 @@ msgstr "" "Aktivera om du vill anvфnda patch mapping fіr att emulera en MT-32 pх en " "Roland GS-enhet" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Anvфnd inte Roland MT-32 musik" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Undertext och tal:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Tal" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Undertexter" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Bхda" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text och tal:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Tal" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Text" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Bхda" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Visa undertexter och spela upp tal" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Ljud av" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Volym fіr specialeffekter" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 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:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "GUI-rendering:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Tangenter" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 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:1386 +#: gui/options.cpp:1384 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:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Vфlj katalog fіr GUI-teman" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Vфlj katalog fіr extra filer" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Vфlj katalog fіr tillфgg" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -950,6 +982,29 @@ msgstr "" "Temat du valde stіder inte ditt sprхk. Om du vill anvфnda det hфr temat " "mхste fіrst byta till ett annat sprхk." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Radera" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1437,14 +1492,18 @@ msgstr "" msgid "Start anyway" msgstr "Starta фndх" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "MAME OPL-emulator" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "DOSBox OPL-emulator" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1494,7 +1553,7 @@ msgstr "Ingen musik" msgid "Amiga Audio Emulator" msgstr "Amiga ljudemulator" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "AdLib-emulator" @@ -1766,9 +1825,8 @@ msgstr "Snabblфge" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Avsluta" @@ -2127,14 +2185,13 @@ msgstr "Klickning deaktiverad" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Anvфnd originalskфrmar fіr spara/ladda" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 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" @@ -3419,39 +3476,44 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "Anvфnder originalskфrmarna fіr spara/ladda istфllet fіr ScummVM:s" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Aktivera heliumlфge" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Aktivera heliumlфge" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Anvфnd de alternativa silverpekarna istфllet fіr de normala guldpekarna" diff --git a/po/uk_UA.po b/po/uk_UA.po index 7245d1bcf7..c9f722c700 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2015-06-30 20:57+0100\n" +"POT-Creation-Date: 2015-09-06 15:14+0200\n" "PO-Revision-Date: 2014-07-01 02:34+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Ukrainian\n" @@ -32,7 +32,7 @@ msgstr "Включені в білд опції:" msgid "Available engines:" msgstr "Доступні движки:" -#: gui/browser.cpp:68 +#: gui/browser.cpp:68 gui/browser_osx.mm:104 msgid "Show hidden files" msgstr "Показати cховані файлі" @@ -53,13 +53,14 @@ msgctxt "lowres" msgid "Go up" msgstr "Вгору" -#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:351 gui/massadd.cpp:95 gui/options.cpp:1239 -#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156 -#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276 -#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931 -#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 -#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48 +#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 +#: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 +#: gui/options.cpp:1237 gui/predictivedialog.cpp:74 gui/recorderdialog.cpp:70 +#: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 +#: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:483 +#: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274 @@ -67,10 +68,27 @@ msgstr "Вгору" msgid "Cancel" msgstr "Відміна" -#: gui/browser.cpp:76 gui/chooser.cpp:47 gui/themebrowser.cpp:56 +#: gui/browser.cpp:76 gui/browser_osx.mm:103 gui/chooser.cpp:47 +#: gui/themebrowser.cpp:56 msgid "Choose" msgstr "Вибрати" +#: gui/editrecorddialog.cpp:58 +msgid "Author:" +msgstr "" + +#: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204 +msgid "Name:" +msgstr "Назва:" + +#: gui/editrecorddialog.cpp:60 +msgid "Notes:" +msgstr "" + +#: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75 +msgid "Ok" +msgstr "" + #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141 #: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192 @@ -103,7 +121,7 @@ msgid "Map" msgstr "Призначити" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048 -#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1240 +#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238 #: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153 #: engines/engine.cpp:402 engines/engine.cpp:413 #: backends/platform/wii/options.cpp:47 @@ -165,10 +183,6 @@ msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:204 -msgid "Name:" -msgstr "Назва:" - #: gui/launcher.cpp:204 gui/launcher.cpp:206 gui/launcher.cpp:207 msgid "Full title of the game" msgstr "Повна назва гри" @@ -191,7 +205,7 @@ msgstr "" "українську" #: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 +#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 #: audio/null.cpp:41 msgid "<default>" msgstr "<за умовчанням>" @@ -213,11 +227,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 +#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 msgid "GFX" msgstr "Грф" @@ -230,7 +244,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:257 gui/options.cpp:1096 +#: gui/launcher.cpp:257 gui/options.cpp:1094 msgid "Audio" msgstr "Аудіо" @@ -243,11 +257,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:271 gui/options.cpp:1101 +#: gui/launcher.cpp:271 gui/options.cpp:1099 msgid "Volume" msgstr "Гучність" -#: gui/launcher.cpp:273 gui/options.cpp:1103 +#: gui/launcher.cpp:273 gui/options.cpp:1101 msgctxt "lowres" msgid "Volume" msgstr "Гучн." @@ -261,7 +275,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:286 gui/options.cpp:1111 +#: gui/launcher.cpp:286 gui/options.cpp:1109 msgid "MIDI" msgstr "MIDI" @@ -274,7 +288,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1117 +#: gui/launcher.cpp:300 gui/options.cpp:1115 msgid "MT-32" msgstr "MT-32" @@ -287,11 +301,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1124 +#: gui/launcher.cpp:314 gui/options.cpp:1122 msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:316 gui/options.cpp:1126 +#: gui/launcher.cpp:316 gui/options.cpp:1124 msgctxt "lowres" msgid "Paths" msgstr "Шляхи" @@ -305,7 +319,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Шлях до гри:" -#: gui/launcher.cpp:330 gui/options.cpp:1150 +#: gui/launcher.cpp:330 gui/options.cpp:1148 msgid "Extra Path:" msgstr "Додатк. шлях:" @@ -313,42 +327,42 @@ msgstr "Додатк. шлях:" msgid "Specifies path to additional data used by the game" msgstr "Вказує шлях до додаткових файлів даних для гри" -#: gui/launcher.cpp:332 gui/options.cpp:1152 +#: gui/launcher.cpp:332 gui/options.cpp:1150 msgctxt "lowres" msgid "Extra Path:" msgstr "Дод. шлях:" -#: gui/launcher.cpp:339 gui/options.cpp:1134 +#: gui/launcher.cpp:339 gui/options.cpp:1132 msgid "Save Path:" msgstr "Шлях збер.:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 +#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 msgid "Specifies where your saved games are put" msgstr "Вказує шлях до збережень гри" -#: gui/launcher.cpp:341 gui/options.cpp:1136 +#: gui/launcher.cpp:341 gui/options.cpp:1134 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях збер.:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 -#: gui/options.cpp:1162 gui/options.cpp:1277 gui/options.cpp:1283 -#: gui/options.cpp:1291 gui/options.cpp:1321 gui/options.cpp:1327 -#: gui/options.cpp:1334 gui/options.cpp:1427 gui/options.cpp:1430 -#: gui/options.cpp:1442 +#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 +#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 +#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 +#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 +#: gui/options.cpp:1440 msgctxt "path" msgid "None" msgstr "Не завданий" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1271 gui/options.cpp:1315 gui/options.cpp:1433 +#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "За умовчанням" -#: gui/launcher.cpp:510 gui/options.cpp:1436 +#: gui/launcher.cpp:510 gui/options.cpp:1434 msgid "Select SoundFont" msgstr "Виберіть SoundFont" @@ -360,7 +374,7 @@ msgstr "Виберіть папку з файлами гри" msgid "Select additional game directory" msgstr "Виберіть додаткову папку гри" -#: gui/launcher.cpp:559 gui/options.cpp:1379 +#: gui/launcher.cpp:559 gui/options.cpp:1377 msgid "Select directory for saved games" msgstr "Виберіть папку для збережень" @@ -558,6 +572,24 @@ msgstr "Проглянуто %d папок ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Знайдено %d нових ігор, пропущено %d попередньо доданих ігор ..." +#: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103 +msgid "Stop" +msgstr "" + +#: gui/onscreendialog.cpp:106 +msgid "Edit record description" +msgstr "" + +#: gui/onscreendialog.cpp:108 +#, fuzzy +msgid "Switch to Game" +msgstr "Перемкнути" + +#: gui/onscreendialog.cpp:110 +#, fuzzy +msgid "Fast replay" +msgstr "Швидкий режим" + #: gui/options.cpp:85 msgid "Never" msgstr "Ніколи" @@ -598,8 +630,8 @@ msgstr "44 кГц" msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:481 gui/options.cpp:582 -#: gui/options.cpp:651 gui/options.cpp:859 +#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 +#: gui/options.cpp:649 gui/options.cpp:857 msgctxt "soundfont" msgid "None" msgstr "Не заданий" @@ -620,70 +652,70 @@ msgstr "не вдалося змінити режим повного екрану" msgid "the aspect ratio setting could not be changed" msgstr "не вдалося змінити режим корекції співвідношення сторін" -#: gui/options.cpp:734 +#: gui/options.cpp:732 msgid "Graphics mode:" msgstr "Графічн. режим:" -#: gui/options.cpp:748 +#: gui/options.cpp:746 msgid "Render mode:" msgstr "Режим раструв.:" -#: gui/options.cpp:748 gui/options.cpp:749 +#: gui/options.cpp:746 gui/options.cpp:747 msgid "Special dithering modes supported by some games" msgstr "Спеціальні режими растрування, які підтримують деякі ігри" -#: gui/options.cpp:760 +#: gui/options.cpp:758 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2298 msgid "Fullscreen mode" msgstr "Повноекранний режим" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Aspect ratio correction" msgstr "Корекція співвідношення сторін" -#: gui/options.cpp:763 +#: gui/options.cpp:761 msgid "Correct aspect ratio for 320x200 games" msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Preferred Device:" msgstr "Уподобаний пристрій:" -#: gui/options.cpp:771 +#: gui/options.cpp:769 msgid "Music Device:" msgstr "Музич. пристрій:" -#: gui/options.cpp:771 gui/options.cpp:773 +#: gui/options.cpp:769 gui/options.cpp:771 msgid "Specifies preferred sound device or sound card emulator" msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 +#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 msgid "Specifies output sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Уподоб. пристрій:" -#: gui/options.cpp:773 +#: gui/options.cpp:771 msgctxt "lowres" msgid "Music Device:" msgstr "Музичний пристрій:" -#: gui/options.cpp:800 +#: gui/options.cpp:798 msgid "AdLib emulator:" msgstr "Емулятор AdLib:" -#: gui/options.cpp:800 gui/options.cpp:801 +#: gui/options.cpp:798 gui/options.cpp:799 msgid "AdLib is used for music in many games" msgstr "Звукова карта AdLib використовується багатьма іграми" -#: gui/options.cpp:811 +#: gui/options.cpp:809 msgid "Output rate:" msgstr "Вихідна частота:" -#: gui/options.cpp:811 gui/options.cpp:812 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -691,67 +723,67 @@ msgstr "" "Великі значення задають кращу якість звуку, проте вони можуть не " "підтримуватися вашою звуковою картою" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "GM Device:" msgstr "Пристрій GM:" -#: gui/options.cpp:822 +#: gui/options.cpp:820 msgid "Specifies default sound device for General MIDI output" msgstr "Вказує вихідний звуковий пристрій для General MIDI" -#: gui/options.cpp:833 +#: gui/options.cpp:831 msgid "Don't use General MIDI music" msgstr "Не використовувати музику General MIDI" -#: gui/options.cpp:844 gui/options.cpp:910 +#: gui/options.cpp:842 gui/options.cpp:908 msgid "Use first available device" msgstr "Використовувати перший наявний пристрій" -#: gui/options.cpp:856 +#: gui/options.cpp:854 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 +#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont підтримується деякими звуковими картами, FluidSynth та Timidity" -#: gui/options.cpp:858 +#: gui/options.cpp:856 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Mixed AdLib/MIDI mode" msgstr "Змішаний режим AdLib/MIDI" -#: gui/options.cpp:864 +#: gui/options.cpp:862 msgid "Use both MIDI and AdLib sound generation" msgstr "Використовувати і MIDI і AdLib для генерації звуку" -#: gui/options.cpp:867 +#: gui/options.cpp:865 msgid "MIDI gain:" msgstr "Посилення MIDI:" -#: gui/options.cpp:874 +#: gui/options.cpp:872 msgid "FluidSynth Settings" msgstr "Налаштування FluidSynth" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "MT-32 Device:" msgstr "Пристрій MT-32:" -#: gui/options.cpp:881 +#: gui/options.cpp:879 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Вказує звуковий пристрій за умовчанням для виводу на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:886 +#: gui/options.cpp:884 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:886 gui/options.cpp:888 +#: gui/options.cpp:884 gui/options.cpp:886 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -759,16 +791,16 @@ msgstr "" "Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви " "хочете його використовувати" -#: gui/options.cpp:888 +#: gui/options.cpp:886 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Режим Roland GS (ввімкнути маплення MT-32)" -#: gui/options.cpp:891 +#: gui/options.cpp:889 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -776,175 +808,175 @@ msgstr "" "Відмітьте, якщо хочете включити латки для іструментів для емуляції MT-32 на " "Roland" -#: gui/options.cpp:900 +#: gui/options.cpp:898 msgid "Don't use Roland MT-32 music" msgstr "Не використовувати музику для Roland MT-32" -#: gui/options.cpp:927 +#: gui/options.cpp:925 msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:931 gui/options.cpp:941 +#: gui/options.cpp:929 gui/options.cpp:939 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:932 gui/options.cpp:942 +#: gui/options.cpp:930 gui/options.cpp:940 msgid "Subtitles" msgstr "Субтитри" -#: gui/options.cpp:933 +#: gui/options.cpp:931 msgid "Both" msgstr "Все" -#: gui/options.cpp:935 +#: gui/options.cpp:933 msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:937 +#: gui/options.cpp:935 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:941 +#: gui/options.cpp:939 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:942 +#: gui/options.cpp:940 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgctxt "lowres" msgid "Both" msgstr "Все" -#: gui/options.cpp:943 +#: gui/options.cpp:941 msgid "Show subtitles and play speech" msgstr "Показувати субтитри і відтворювати мову" -#: gui/options.cpp:945 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:961 +#: gui/options.cpp:959 msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:963 +#: gui/options.cpp:961 msgctxt "lowres" msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:970 +#: gui/options.cpp:968 msgid "Mute All" msgstr "Вимкнути все" -#: gui/options.cpp:973 +#: gui/options.cpp:971 msgid "SFX volume:" msgstr "Гучність ефектів:" -#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 +#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 msgid "Special sound effects volume" msgstr "Гучність спеціальних звукових ефектів" -#: gui/options.cpp:975 +#: gui/options.cpp:973 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. ефектів:" -#: gui/options.cpp:983 +#: gui/options.cpp:981 msgid "Speech volume:" msgstr "Гучність озвучки:" -#: gui/options.cpp:985 +#: gui/options.cpp:983 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. озвучки:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1140 msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1144 +#: gui/options.cpp:1142 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Вказує шлях до додаткових файлів даних, які використовуються усіма іграми " "або ScummVM" -#: gui/options.cpp:1159 +#: gui/options.cpp:1157 msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1161 +#: gui/options.cpp:1159 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1170 gui/fluidsynth-dialog.cpp:138 +#: gui/options.cpp:1168 gui/fluidsynth-dialog.cpp:138 msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1172 +#: gui/options.cpp:1170 msgctxt "lowres" msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1174 +#: gui/options.cpp:1172 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1178 +#: gui/options.cpp:1176 msgid "GUI Renderer:" msgstr "Растер. GUI:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1188 msgid "Autosave:" msgstr "Автозбереження:" -#: gui/options.cpp:1192 +#: gui/options.cpp:1190 msgctxt "lowres" msgid "Autosave:" msgstr "Автозбереж.:" -#: gui/options.cpp:1200 +#: gui/options.cpp:1198 msgid "Keys" msgstr "Клавіші" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "GUI Language:" msgstr "Мова інтерф.:" -#: gui/options.cpp:1207 +#: gui/options.cpp:1205 msgid "Language of ScummVM GUI" msgstr "Мова графічного інтерфейсу ScummVM" -#: gui/options.cpp:1366 +#: gui/options.cpp:1364 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Ви повинні перезапустити ScummVM щоб застосувати зміни." -#: gui/options.cpp:1386 +#: gui/options.cpp:1384 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу." -#: gui/options.cpp:1395 +#: gui/options.cpp:1393 msgid "Select directory for GUI themes" msgstr "Виберіть папку для тем GUI" -#: gui/options.cpp:1405 +#: gui/options.cpp:1403 msgid "Select directory for extra files" msgstr "Виберіть папку з додатковими файлами" -#: gui/options.cpp:1416 +#: gui/options.cpp:1414 msgid "Select directory for plugins" msgstr "Виберіть папку зі втулками" -#: gui/options.cpp:1469 +#: gui/options.cpp:1467 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." @@ -952,6 +984,29 @@ msgstr "" "Вибрана тема не підтримує поточну мову. Якщо ви хочете використовувати цю " "тему, потрібно в першу чергу змінити мову." +#. I18N: You must leave "#" as is, only word 'next' is translatable +#: gui/predictivedialog.cpp:87 +msgid "# next" +msgstr "" + +#: gui/predictivedialog.cpp:88 +msgid "add" +msgstr "" + +#: gui/predictivedialog.cpp:92 +#, fuzzy +msgid "Delete char" +msgstr "Видалити" + +#: gui/predictivedialog.cpp:96 +msgid "<" +msgstr "" + +#. I18N: Pre means 'Predictive', leave '*' as is +#: gui/predictivedialog.cpp:98 +msgid "* Pre" +msgstr "" + #: gui/recorderdialog.cpp:64 msgid "Recorder or Playback Gameplay" msgstr "" @@ -1437,14 +1492,18 @@ msgstr "" msgid "Start anyway" msgstr "Все одно запустити" -#: audio/fmopl.cpp:50 +#: audio/fmopl.cpp:62 msgid "MAME OPL emulator" msgstr "Емулятор MAME OPL" -#: audio/fmopl.cpp:52 +#: audio/fmopl.cpp:64 msgid "DOSBox OPL emulator" msgstr "Емулятор DOSBox OPL" +#: audio/fmopl.cpp:67 +msgid "ALSA Direct FM" +msgstr "" + #: audio/mididrv.cpp:209 #, c-format msgid "" @@ -1494,7 +1553,7 @@ msgstr "Без музики" msgid "Amiga Audio Emulator" msgstr "Аміга Аудіо Емулятор" -#: audio/softsynth/adlib.cpp:2285 +#: audio/adlib.cpp:2291 msgid "AdLib Emulator" msgstr "Емулятор AdLib" @@ -1766,9 +1825,8 @@ msgstr "Швидкий режим" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 -#: backends/events/default/default-events.cpp:218 -#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83 -#: engines/scumm/help.cpp:85 +#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192 +#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85 msgid "Quit" msgstr "Вихід" @@ -2126,14 +2184,13 @@ msgstr "Кліки вимкнено" #: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 -#: engines/zvision/detection.cpp:246 +#: engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Використовувати ориг. збереження/завантаження екрани" #: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 -#: engines/zvision/detection.cpp:247 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Використовувати оригінальні збереження/завантаження екрани, замість ScummVM" @@ -3419,39 +3476,45 @@ msgstr "" msgid "Show the current number of frames per second in the upper left corner" msgstr "" -#: engines/zvision/detection.cpp:256 +#: engines/zvision/detection_tables.h:52 +#, fuzzy +msgid "Use the original save/load screens instead of the ScummVM interface" +msgstr "" +"Використовувати оригінальні збереження/завантаження екрани, замість ScummVM" + +#: engines/zvision/detection_tables.h:61 msgid "Double FPS" msgstr "" -#: engines/zvision/detection.cpp:257 -msgid "Increase game FPS from 30 to 60" +#: engines/zvision/detection_tables.h:62 +msgid "Increase framerate from 30 to 60 FPS" msgstr "" -#: engines/zvision/detection.cpp:266 +#: engines/zvision/detection_tables.h:71 #, fuzzy msgid "Enable Venus" msgstr "Увімкнути режим Геліум" -#: engines/zvision/detection.cpp:267 +#: engines/zvision/detection_tables.h:72 +#, fuzzy msgid "Enable the Venus help system" -msgstr "" +msgstr "Увімкнути режим Геліум" -#: engines/zvision/detection.cpp:276 +#: engines/zvision/detection_tables.h:81 msgid "Disable animation while turning" msgstr "" -#: engines/zvision/detection.cpp:277 -msgid "Disable animation while turning in panoramic mode" +#: engines/zvision/detection_tables.h:82 +msgid "Disable animation while turning in panorama mode" msgstr "" -#: engines/zvision/detection.cpp:286 -msgid "Use the hires MPEG movies" +#: engines/zvision/detection_tables.h:91 +msgid "Use high resolution MPEG video" msgstr "" -#: engines/zvision/detection.cpp:287 +#: engines/zvision/detection_tables.h:92 #, fuzzy -msgid "" -"Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones" +msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Використовувати альтернативний набір срібних курсорів, замість звичайних " "золотих" diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 700975d9a2..52a55f600c 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -31,6 +31,7 @@ // Audio Codecs #include "audio/decoders/adpcm.h" +#include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" // Video Codecs @@ -277,7 +278,9 @@ void AVIDecoder::handleStreamHeader(uint32 size) { if (wvInfo.channels == 2) sHeader.sampleSize /= 2; - addTrack(createAudioTrack(sHeader, wvInfo)); + AVIAudioTrack *track = createAudioTrack(sHeader, wvInfo); + track->createAudioStream(); + addTrack(track); } // Ensure that we're at the end of the chunk @@ -840,37 +843,18 @@ void AVIDecoder::AVIVideoTrack::setDither(const byte *palette) { } AVIDecoder::AVIAudioTrack::AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType) - : _audsHeader(streamHeader), _wvInfo(waveFormat), _soundType(soundType), _curChunk(0) { - _audStream = createAudioStream(); + : _audsHeader(streamHeader), _wvInfo(waveFormat), _soundType(soundType), _audioStream(0), _packetStream(0), _curChunk(0) { } AVIDecoder::AVIAudioTrack::~AVIAudioTrack() { - delete _audStream; + delete _audioStream; } void AVIDecoder::AVIAudioTrack::queueSound(Common::SeekableReadStream *stream) { - if (_audStream) { - if (_wvInfo.tag == kWaveFormatPCM) { - byte flags = 0; - if (_audsHeader.sampleSize == 2) - flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN; - else - flags |= Audio::FLAG_UNSIGNED; - - if (_wvInfo.channels == 2) - flags |= Audio::FLAG_STEREO; - - _audStream->queueAudioStream(Audio::makeRawStream(stream, _wvInfo.samplesPerSec, flags, DisposeAfterUse::YES), DisposeAfterUse::YES); - } else if (_wvInfo.tag == kWaveFormatMSADPCM) { - _audStream->queueAudioStream(Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMMS, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign), DisposeAfterUse::YES); - } else if (_wvInfo.tag == kWaveFormatMSIMAADPCM) { - _audStream->queueAudioStream(Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMMSIma, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign), DisposeAfterUse::YES); - } else if (_wvInfo.tag == kWaveFormatDK3) { - _audStream->queueAudioStream(Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMDK3, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign), DisposeAfterUse::YES); - } - } else { + if (_packetStream) + _packetStream->queuePacket(stream); + else delete stream; - } _curChunk++; } @@ -882,17 +866,21 @@ void AVIDecoder::AVIAudioTrack::skipAudio(const Audio::Timestamp &time, const Au if (skipFrames <= 0) return; - if (_audStream->isStereo()) + Audio::AudioStream *audioStream = getAudioStream(); + if (!audioStream) + return; + + if (audioStream->isStereo()) skipFrames *= 2; int16 *tempBuffer = new int16[skipFrames]; - _audStream->readBuffer(tempBuffer, skipFrames); + audioStream->readBuffer(tempBuffer, skipFrames); delete[] tempBuffer; } void AVIDecoder::AVIAudioTrack::resetStream() { - delete _audStream; - _audStream = createAudioStream(); + delete _audioStream; + createAudioStream(); _curChunk = 0; } @@ -901,19 +889,50 @@ bool AVIDecoder::AVIAudioTrack::rewind() { return true; } -Audio::AudioStream *AVIDecoder::AVIAudioTrack::getAudioStream() const { - return _audStream; -} +void AVIDecoder::AVIAudioTrack::createAudioStream() { + _packetStream = 0; + + switch (_wvInfo.tag) { + case kWaveFormatPCM: { + byte flags = 0; + if (_audsHeader.sampleSize == 2) + flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN; + else + flags |= Audio::FLAG_UNSIGNED; -Audio::QueuingAudioStream *AVIDecoder::AVIAudioTrack::createAudioStream() { - if (_wvInfo.tag == kWaveFormatPCM || _wvInfo.tag == kWaveFormatMSADPCM || _wvInfo.tag == kWaveFormatMSIMAADPCM || _wvInfo.tag == kWaveFormatDK3) - return Audio::makeQueuingAudioStream(_wvInfo.samplesPerSec, _wvInfo.channels == 2); - else if (_wvInfo.tag == kWaveFormatMP3) - warning("Unsupported AVI MP3 tracks"); - else if (_wvInfo.tag != kWaveFormatNone) // No sound + if (_wvInfo.channels == 2) + flags |= Audio::FLAG_STEREO; + + _packetStream = Audio::makePacketizedRawStream(_wvInfo.samplesPerSec, flags); + break; + } + case kWaveFormatMSADPCM: + _packetStream = Audio::makePacketizedADPCMStream(Audio::kADPCMMS, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign); + break; + case kWaveFormatMSIMAADPCM: + _packetStream = Audio::makePacketizedADPCMStream(Audio::kADPCMMSIma, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign); + break; + case kWaveFormatDK3: + _packetStream = Audio::makePacketizedADPCMStream(Audio::kADPCMDK3, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign); + break; + case kWaveFormatMP3: +#ifdef USE_MAD + _packetStream = Audio::makePacketizedMP3Stream(_wvInfo.channels, _wvInfo.samplesPerSec); +#else + warning("AVI MP3 stream found, but no libmad support compiled in"); +#endif + break; + case kWaveFormatNone: + break; + default: warning("Unsupported AVI audio format %d", _wvInfo.tag); + break; + } - return 0; + if (_packetStream) + _audioStream = _packetStream; + else + _audioStream = Audio::makeNullAudioStream(); } AVIDecoder::TrackStatus::TrackStatus() : track(0), chunkSearchOffset(0) { diff --git a/video/avi_decoder.h b/video/avi_decoder.h index 6c1ce1a4b9..96d9e821ff 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -32,7 +32,8 @@ #include "audio/mixer.h" namespace Audio { -class QueuingAudioStream; +class AudioStream; +class PacketizedAudioStream; } namespace Common { @@ -215,6 +216,7 @@ protected: AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType); ~AVIAudioTrack(); + virtual void createAudioStream(); virtual void queueSound(Common::SeekableReadStream *stream); Audio::Mixer::SoundType getSoundType() const { return _soundType; } void skipAudio(const Audio::Timestamp &time, const Audio::Timestamp &frameTime); @@ -226,7 +228,7 @@ protected: bool rewind(); protected: - Audio::AudioStream *getAudioStream() const; + Audio::AudioStream *getAudioStream() const { return _audioStream; } // Audio Codecs enum { @@ -241,8 +243,8 @@ protected: AVIStreamHeader _audsHeader; PCMWaveFormat _wvInfo; Audio::Mixer::SoundType _soundType; - Audio::QueuingAudioStream *_audStream; - Audio::QueuingAudioStream *createAudioStream(); + Audio::AudioStream *_audioStream; + Audio::PacketizedAudioStream *_packetStream; uint32 _curChunk; }; diff --git a/video/mpegps_decoder.cpp b/video/mpegps_decoder.cpp index d8f7f5a68c..6942efbe87 100644 --- a/video/mpegps_decoder.cpp +++ b/video/mpegps_decoder.cpp @@ -22,6 +22,7 @@ #include "audio/audiostream.h" #include "audio/decoders/raw.h" +#include "audio/decoders/mp3.h" #include "common/debug.h" #include "common/endian.h" #include "common/stream.h" @@ -142,7 +143,7 @@ void MPEGPSDecoder::readNextPacket() { } else if (startCode >= 0x1C0 && startCode <= 0x1DF) { #ifdef USE_MAD // MPEG Audio stream - MPEGAudioTrack *audioTrack = new MPEGAudioTrack(packet); + MPEGAudioTrack *audioTrack = new MPEGAudioTrack(*packet); stream = audioTrack; _streamMap[startCode] = audioTrack; addTrack(audioTrack); @@ -158,6 +159,8 @@ void MPEGPSDecoder::readNextPacket() { } if (stream) { + packet->seek(0); + bool done = stream->sendPacket(packet, pts, dts); if (done && stream->getStreamType() == MPEGStream::kStreamTypeVideo) @@ -510,54 +513,16 @@ void MPEGPSDecoder::MPEGVideoTrack::findDimensions(Common::SeekableReadStream *f // The audio code here is almost entirely based on what we do in mp3.cpp -MPEGPSDecoder::MPEGAudioTrack::MPEGAudioTrack(Common::SeekableReadStream *firstPacket) { - // The MAD_BUFFER_GUARD must always contain zeros (the reason - // for this is that the Layer III Huffman decoder of libMAD - // may read a few bytes beyond the end of the input buffer). - memset(_buf + BUFFER_SIZE, 0, MAD_BUFFER_GUARD); - - _state = MP3_STATE_INIT; - _audStream = 0; - - // Find out our audio parameters - initStream(firstPacket); - - while (_state != MP3_STATE_EOS) - readHeader(firstPacket); - - _audStream = Audio::makeQueuingAudioStream(_frame.header.samplerate, MAD_NCHANNELS(&_frame.header) == 2); - - deinitStream(); - - firstPacket->seek(0); - _state = MP3_STATE_INIT; +MPEGPSDecoder::MPEGAudioTrack::MPEGAudioTrack(Common::SeekableReadStream &firstPacket) { + _audStream = Audio::makePacketizedMP3Stream(firstPacket); } MPEGPSDecoder::MPEGAudioTrack::~MPEGAudioTrack() { - deinitStream(); delete _audStream; } -static inline int scaleSample(mad_fixed_t sample) { - // round - sample += (1L << (MAD_F_FRACBITS - 16)); - - // clip - if (sample > MAD_F_ONE - 1) - sample = MAD_F_ONE - 1; - else if (sample < -MAD_F_ONE) - sample = -MAD_F_ONE; - - // quantize and scale to not saturate when mixing a lot of channels - return sample >> (MAD_F_FRACBITS + 1 - 16); -} - bool MPEGPSDecoder::MPEGAudioTrack::sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts) { - while (_state != MP3_STATE_EOS) - decodeMP3Data(packet); - - _state = MP3_STATE_READY; - delete packet; + _audStream->queuePacket(packet); return true; } @@ -565,168 +530,6 @@ Audio::AudioStream *MPEGPSDecoder::MPEGAudioTrack::getAudioStream() const { return _audStream; } -void MPEGPSDecoder::MPEGAudioTrack::initStream(Common::SeekableReadStream *packet) { - if (_state != MP3_STATE_INIT) - deinitStream(); - - // Init MAD - mad_stream_init(&_stream); - mad_frame_init(&_frame); - mad_synth_init(&_synth); - - // Reset the stream data - packet->seek(0, SEEK_SET); - - // Update state - _state = MP3_STATE_READY; - - // Read the first few sample bytes - readMP3Data(packet); -} - -void MPEGPSDecoder::MPEGAudioTrack::deinitStream() { - if (_state == MP3_STATE_INIT) - return; - - // Deinit MAD - mad_synth_finish(&_synth); - mad_frame_finish(&_frame); - mad_stream_finish(&_stream); - - _state = MP3_STATE_EOS; -} - -void MPEGPSDecoder::MPEGAudioTrack::readMP3Data(Common::SeekableReadStream *packet) { - uint32 remaining = 0; - - // Give up immediately if we already used up all data in the stream - if (packet->eos()) { - _state = MP3_STATE_EOS; - return; - } - - if (_stream.next_frame) { - // If there is still data in the MAD stream, we need to preserve it. - // Note that we use memmove, as we are reusing the same buffer, - // and hence the data regions we copy from and to may overlap. - remaining = _stream.bufend - _stream.next_frame; - assert(remaining < BUFFER_SIZE); // Paranoia check - memmove(_buf, _stream.next_frame, remaining); - } - - memset(_buf + remaining, 0, BUFFER_SIZE - remaining); - - // Try to read the next block - uint32 size = packet->read(_buf + remaining, BUFFER_SIZE - remaining); - if (size == 0) { - _state = MP3_STATE_EOS; - return; - } - - // Feed the data we just read into the stream decoder - _stream.error = MAD_ERROR_NONE; - mad_stream_buffer(&_stream, _buf, size + remaining); -} - -void MPEGPSDecoder::MPEGAudioTrack::readHeader(Common::SeekableReadStream *packet) { - if (_state != MP3_STATE_READY) - return; - - // If necessary, load more data into the stream decoder - if (_stream.error == MAD_ERROR_BUFLEN) - readMP3Data(packet); - - while (_state != MP3_STATE_EOS) { - _stream.error = MAD_ERROR_NONE; - - // Decode the next header. Note: mad_frame_decode would do this for us, too. - // However, for seeking we don't want to decode the full frame (else it would - // be far too slow). Hence we perform this explicitly in a separate step. - if (mad_header_decode(&_frame.header, &_stream) == -1) { - if (_stream.error == MAD_ERROR_BUFLEN) { - readMP3Data(packet); // Read more data - continue; - } else if (MAD_RECOVERABLE(_stream.error)) { - debug(6, "MPEGAudioTrack::readHeader(): Recoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream)); - continue; - } else { - warning("MPEGAudioTrack::readHeader(): Unrecoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream)); - break; - } - } - - break; - } - - if (_stream.error != MAD_ERROR_NONE) - _state = MP3_STATE_EOS; -} - -void MPEGPSDecoder::MPEGAudioTrack::decodeMP3Data(Common::SeekableReadStream *packet) { - if (_state == MP3_STATE_INIT) - initStream(packet); - - if (_state == MP3_STATE_EOS) - return; - - do { - // If necessary, load more data into the stream decoder - if (_stream.error == MAD_ERROR_BUFLEN) - readMP3Data(packet); - - while (_state == MP3_STATE_READY) { - _stream.error = MAD_ERROR_NONE; - - // Decode the next frame - if (mad_frame_decode(&_frame, &_stream) == -1) { - if (_stream.error == MAD_ERROR_BUFLEN) { - break; // Read more data - } else if (MAD_RECOVERABLE(_stream.error)) { - // Note: we will occasionally see MAD_ERROR_BADDATAPTR errors here. - // These are normal and expected (caused by our frame skipping (i.e. "seeking") - // code above). - debug(6, "MPEGAudioTrack::decodeMP3Data(): Recoverable error in mad_frame_decode (%s)", mad_stream_errorstr(&_stream)); - continue; - } else { - warning("MPEGAudioTrack::decodeMP3Data(): Unrecoverable error in mad_frame_decode (%s)", mad_stream_errorstr(&_stream)); - break; - } - } - - // Synthesize PCM data - mad_synth_frame(&_synth, &_frame); - - // Output it to our queue - if (_synth.pcm.length != 0) { - byte *buffer = (byte *)malloc(_synth.pcm.length * 2 * MAD_NCHANNELS(&_frame.header)); - int16 *ptr = (int16 *)buffer; - - for (int i = 0; i < _synth.pcm.length; i++) { - *ptr++ = (int16)scaleSample(_synth.pcm.samples[0][i]); - - if (MAD_NCHANNELS(&_frame.header) == 2) - *ptr++ = (int16)scaleSample(_synth.pcm.samples[1][i]); - } - - int flags = Audio::FLAG_16BITS; - - if (_audStream->isStereo()) - flags |= Audio::FLAG_STEREO; - -#ifdef SCUMM_LITTLE_ENDIAN - flags |= Audio::FLAG_LITTLE_ENDIAN; -#endif - - _audStream->queueBuffer(buffer, _synth.pcm.length * 2 * MAD_NCHANNELS(&_frame.header), DisposeAfterUse::YES, flags); - } - break; - } - } while (_state != MP3_STATE_EOS && _stream.error == MAD_ERROR_BUFLEN); - - if (_stream.error != MAD_ERROR_NONE) - _state = MP3_STATE_EOS; -} - #endif } // End of namespace Video diff --git a/video/mpegps_decoder.h b/video/mpegps_decoder.h index 0184d6f9ba..bdff879d96 100644 --- a/video/mpegps_decoder.h +++ b/video/mpegps_decoder.h @@ -27,12 +27,8 @@ #include "graphics/surface.h" #include "video/video_decoder.h" -#ifdef USE_MAD -#include <mad.h> -#endif - namespace Audio { -class QueuingAudioStream; +class PacketizedAudioStream; } namespace Common { @@ -115,10 +111,9 @@ private: #ifdef USE_MAD // An MPEG audio track - // TODO: Merge this with the normal MP3Stream somehow class MPEGAudioTrack : public AudioTrack, public MPEGStream { public: - MPEGAudioTrack(Common::SeekableReadStream *firstPacket); + MPEGAudioTrack(Common::SeekableReadStream &firstPacket); ~MPEGAudioTrack(); bool sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts); @@ -128,32 +123,7 @@ private: Audio::AudioStream *getAudioStream() const; private: - Audio::QueuingAudioStream *_audStream; - - enum State { - MP3_STATE_INIT, // Need to init the decoder - MP3_STATE_READY, // ready for processing data - MP3_STATE_EOS // end of data reached (may need to loop) - }; - - State _state; - - mad_stream _stream; - mad_frame _frame; - mad_synth _synth; - - enum { - BUFFER_SIZE = 5 * 8192 - }; - - // This buffer contains a slab of input data - byte _buf[BUFFER_SIZE + MAD_BUFFER_GUARD]; - - void initStream(Common::SeekableReadStream *packet); - void deinitStream(); - void readMP3Data(Common::SeekableReadStream *packet); - void readHeader(Common::SeekableReadStream *packet); - void decodeMP3Data(Common::SeekableReadStream *packet); + Audio::PacketizedAudioStream *_audStream; }; #endif |