diff options
177 files changed, 10705 insertions, 6287 deletions
@@ -391,6 +391,9 @@ Other contributions ------------ Thierry Crozat - Translation Lead + Basque: + Mikel Iturbe Urretxa + Catalan: Jordi Vilalta Prat diff --git a/Makefile.common b/Makefile.common index 744ac493e3..2a92ba441c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -153,7 +153,8 @@ endif # Get the current version information ###################################################################### -VERSION = $(shell grep SCUMMVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2) +# AmigaOS4's grep has a problem with "./" in pathnames, so use cat piped into grep. +VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2) VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1) VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2) VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1) @@ -11,12 +11,17 @@ For a more comprehensive changelog of the latest experimental code, see: - Implemented support for TrueType fonts via FreeType2 in our GUI. Along with it GNU FreeFont was also added to our modern theme. Note that not all ports take advantage of this. + - Added Basque translation SDL ports: - Added support for OpenGL (GSoC Task). Broken Sword 1: - Fixed incorrect sound effects in the DOS/Windows demo. + - Added support for PlayStation videos. + + Broken Sword 2: + - Added support for PlayStation videos. Cine: - Implemented Roland MT-32 output driver. @@ -511,6 +511,15 @@ Sword has a "SMACKSLO" directory with the same cutscenes, but these are of lower quality.) You can put them in a subdirectory called "video" if you find that neater. +For the PlayStation versions, you can dump the original videos off the +disc. For each of the files ending in an "STR" extension, you should +dump them as *raw* sectors off the disc (all 2352 bytes per sector). You +may also use the re-encoded cutscenes mentioned below instead, but this +will not work for all videos in Broken Sword II. For more information, +see: + + http://wiki.scummvm.org/index.php/HOWTO-PlayStation_Videos + Some re-releases of the games, as well as the PlayStation version, do not have Smacker videos. Revolution Software has kindly allowed us to provide re-encoded cutscenes for download on our website: @@ -528,8 +537,9 @@ audio. Viewing these cutscenes with OGG Vorbis audio requires a version of ScummVM compiled with both libVorbis and zlib support. For Broken Sword, we also provide a subtitles add-on. Simply unpack it -and follow the instructions in its readme.txt file. (Broken Sword II -already has subtitles; no extra work is needed for them.) +and follow the instructions in its readme.txt file. The subtitle pack +currently does not work when running PlayStation videos. (Broken Sword +II already has subtitles; no extra work is needed for them.) 3.7.2) Broken Sword games cutscenes, in retrospect: @@ -2072,7 +2082,12 @@ King's Quest VI Windows adds the following non-standard keyword: ones. If false, the DOS cursors are used in the Windows version, upscaled to match the rest of the upscaled graphics - + +Space Quest IV CD adds the following non-standard keyword: + + silver_cursors bool If true, an alternate set of silver mouse cursors + is used instead of the original golden ones + Simon the Sorcerer 1 and 2 add the following non-standard keywords: music_mute bool If true, music is muted diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp index f3835c4524..75e6bc3d10 100644 --- a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp +++ b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp @@ -1175,7 +1175,7 @@ void TownsPC98_AudioDriver::loadMusicData(uint8 *data, bool loadPaused) { _patches = src_a + 4; _finishedChannelsFlag = _finishedSSGFlag = _finishedRhythmFlag = 0; - _musicPlaying = (loadPaused ? false : true); + _musicPlaying = !loadPaused; } void TownsPC98_AudioDriver::loadSoundEffectData(uint8 *data, uint8 trackNum) { diff --git a/backends/keymapper/hardware-input.cpp b/backends/keymapper/hardware-input.cpp index a09f0b54fc..d1f8822ac0 100644 --- a/backends/keymapper/hardware-input.cpp +++ b/backends/keymapper/hardware-input.cpp @@ -209,16 +209,33 @@ const HardwareInput *HardwareInputSet::findHardwareInput(String id) const { return 0; } +const HardwareInput *HardwareInputSet::findHardwareInput(const HardwareInputCode code) const { + List<const HardwareInput *>::const_iterator it; + + for (it = _inputs.begin(); it != _inputs.end(); ++it) { + const HardwareInput *entry = *it; + if (entry->type == kHardwareInputTypeGeneric && entry->inputCode == code) + return entry; + } + return 0; +} + const HardwareInput *HardwareInputSet::findHardwareInput(const KeyState& keystate) const { List<const HardwareInput *>::const_iterator it; for (it = _inputs.begin(); it != _inputs.end(); ++it) { - if ((*it)->key == keystate) - return (*it); + const HardwareInput *entry = *it; + if (entry->type == kHardwareInputTypeKeyboard && entry->key == keystate) + return entry; } return 0; } +void HardwareInputSet::addHardwareInputs(const HardwareInputTableEntry inputs[]) { + for (const HardwareInputTableEntry *entry = inputs; entry->hwId; ++entry) + addHardwareInput(new HardwareInput(entry->hwId, entry->code, entry->desc)); +} + void HardwareInputSet::addHardwareInputs(const KeyTableEntry keys[], const ModifierTableEntry modifiers[]) { const KeyTableEntry *key; const ModifierTableEntry *mod; @@ -247,10 +264,6 @@ void HardwareInputSet::addHardwareInputs(const KeyTableEntry keys[], const Modif } } -void HardwareInputSet::addHardwareInputs(const KeyTableEntry keys[]) { - addHardwareInputs(keys, defaultModifiers); -} - void HardwareInputSet::removeHardwareInput(const HardwareInput *input) { if (!input) return; @@ -259,7 +272,16 @@ void HardwareInputSet::removeHardwareInput(const HardwareInput *input) { for (it = _inputs.begin(); it != _inputs.end(); ++it) { const HardwareInput *entry = (*it); - if (entry->id == input->id || entry->key == input->key) { + bool match = false; + if (entry->id == input->id) + match = true; + else if (input->type == entry->type) { + if (input->type == kHardwareInputTypeGeneric && input->inputCode == entry->inputCode) + match = true; + else if (input->type == kHardwareInputTypeKeyboard && input->key == entry->key) + match = true; + } + if (match) { debug(7, "Removing hardware input [%s] (%s) because it matches [%s] (%s)", entry->id.c_str(), entry->description.c_str(), input->id.c_str(), input->description.c_str()); delete entry; _inputs.erase(it); diff --git a/backends/keymapper/hardware-input.h b/backends/keymapper/hardware-input.h index 9396765bbe..51d4accb5b 100644 --- a/backends/keymapper/hardware-input.h +++ b/backends/keymapper/hardware-input.h @@ -34,6 +34,15 @@ namespace Common { +typedef uint32 HardwareInputCode; + +enum HardwareInputType { + /** Input that sends single events */ + kHardwareInputTypeGeneric, + /** Input that usually send -up and -down events */ + kHardwareInputTypeKeyboard +}; + /** * Describes an available hardware input */ @@ -44,14 +53,33 @@ struct HardwareInput { /** Human readable description */ String description; + const HardwareInputType type; + /** - * The KeyState that is generated by the back-end - * when this hardware key is pressed. - */ + * A platform specific unique identifier for an input event + * generated when this input is triggered. + * This is only relevant when type == kHardwareInputTypeGeneric + */ + HardwareInputCode inputCode; + + /** + * The KeyState that is generated by the back-end + * when this hardware key is pressed. + * This is only relevant when type == kHardwareInputTypeKeyboard + */ KeyState key; - HardwareInput(String i, KeyState ky = KeyState(), String desc = "") - : id(i), key(ky), description(desc) { } + HardwareInput(String i, HardwareInputCode ic = 0, String desc = "") + : id(i), inputCode(ic), description(desc), type(kHardwareInputTypeGeneric) { } + + HardwareInput(String i, KeyState ky, String desc = "") + : id(i), key(ky), description(desc), type(kHardwareInputTypeKeyboard) { } +}; + +struct HardwareInputTableEntry { + const char *hwId; + HardwareInputCode code; + const char *desc; }; /** @@ -97,6 +125,8 @@ public: const HardwareInput *findHardwareInput(String id) const; + const HardwareInput *findHardwareInput(const HardwareInputCode code) const; + const HardwareInput *findHardwareInput(const KeyState& keystate) const; const List<const HardwareInput *> &getHardwareInputs() const { return _inputs; } @@ -104,18 +134,17 @@ public: uint size() const { return _inputs.size(); } /** - * Add hardware inputs to the set out of key and modifier tables. - * @param keys table of available keys - * @param modifiers table of available modifiers + * Add hardware inputs to the set out of a table. + * @param inputs table of available inputs */ - void addHardwareInputs(const KeyTableEntry keys[], const ModifierTableEntry modifiers[]); + void addHardwareInputs(const HardwareInputTableEntry inputs[]); /** - * Add hardware inputs to the set out of a key table. - * The default modifiers are applied to the key entries + * Add hardware inputs to the set out of key and modifier tables. * @param keys table of available keys + * @param modifiers table of available modifiers */ - void addHardwareInputs(const KeyTableEntry keys[]); + void addHardwareInputs(const KeyTableEntry keys[], const ModifierTableEntry modifiers[]); void removeHardwareInput(const HardwareInput *input); diff --git a/backends/keymapper/keymap.cpp b/backends/keymapper/keymap.cpp index 8ea975c927..e95dd6afb5 100644 --- a/backends/keymapper/keymap.cpp +++ b/backends/keymapper/keymap.cpp @@ -33,14 +33,17 @@ namespace Common { -Keymap::Keymap(const Keymap& km) : _actions(km._actions), _keymap(), _configDomain(0) { +Keymap::Keymap(const Keymap& km) : _actions(km._actions), _keymap(), _nonkeymap(), _configDomain(0) { List<Action *>::iterator it; for (it = _actions.begin(); it != _actions.end(); ++it) { const HardwareInput *hwInput = (*it)->getMappedInput(); if (hwInput) { - _keymap[hwInput->key] = *it; + if (hwInput->type == kHardwareInputTypeKeyboard) + _keymap[hwInput->key] = *it; + else if (hwInput->type == kHardwareInputTypeGeneric) + _nonkeymap[hwInput->inputCode] = *it; } } } @@ -60,23 +63,31 @@ void Keymap::addAction(Action *action) { } void Keymap::registerMapping(Action *action, const HardwareInput *hwInput) { - HashMap<KeyState, Action *>::iterator it; - - it = _keymap.find(hwInput->key); - - // if key is already mapped to a different action then un-map it - if (it != _keymap.end() && action != it->_value) { - it->_value->mapInput(0); + if (hwInput->type == kHardwareInputTypeKeyboard) { + HashMap<KeyState, Action *>::iterator it = _keymap.find(hwInput->key); + // if input is already mapped to a different action then unmap it from there + if (it != _keymap.end() && action != it->_value) + it->_value->mapInput(0); + // now map it + _keymap[hwInput->key] = action; + } else if (hwInput->type == kHardwareInputTypeGeneric) { + HashMap<HardwareInputCode, Action *>::iterator it = _nonkeymap.find(hwInput->inputCode); + // if input is already mapped to a different action then unmap it from there + if (it != _nonkeymap.end() && action != it->_value) + it->_value->mapInput(0); + // now map it + _nonkeymap[hwInput->inputCode] = action; } - - _keymap[hwInput->key] = action; } void Keymap::unregisterMapping(Action *action) { const HardwareInput *hwInput = action->getMappedInput(); if (hwInput) { - _keymap.erase(hwInput->key); + if (hwInput->type == kHardwareInputTypeKeyboard) + _keymap.erase(hwInput->key); + else if (hwInput->type == kHardwareInputTypeGeneric) + _nonkeymap.erase(hwInput->inputCode); } } @@ -116,6 +127,17 @@ Action *Keymap::getMappedAction(const KeyState& ks) const { return it->_value; } +Action *Keymap::getMappedAction(const HardwareInputCode code) const { + HashMap<HardwareInputCode, Action *>::iterator it; + + it = _nonkeymap.find(code); + + if (it == _nonkeymap.end()) + return 0; + else + return it->_value; +} + void Keymap::setConfigDomain(ConfigManager::Domain *dom) { _configDomain = dom; } diff --git a/backends/keymapper/keymap.h b/backends/keymapper/keymap.h index 4c3e89700f..6eaec7dcaf 100644 --- a/backends/keymapper/keymap.h +++ b/backends/keymapper/keymap.h @@ -33,12 +33,10 @@ #include "common/keyboard.h" #include "common/list.h" #include "backends/keymapper/action.h" +#include "backends/keymapper/hardware-input.h" namespace Common { -struct HardwareInput; -class HardwareInputSet; - /** * Hash function for KeyState */ @@ -76,6 +74,13 @@ public: */ Action *getMappedAction(const KeyState& ks) const; + /** + * Find the Action that a generic input is mapped to + * @param code the input code that is mapped to the required Action + * @return a pointer to the Action or 0 if no + */ + Action *getMappedAction(const HardwareInputCode code) const; + void setConfigDomain(ConfigManager::Domain *dom); /** @@ -130,6 +135,7 @@ private: String _name; List<Action *> _actions; HashMap<KeyState, Action *> _keymap; + HashMap<HardwareInputCode, Action *> _nonkeymap; ConfigManager::Domain *_configDomain; }; diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index bda4cd47da..dcb021f2d8 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -25,9 +25,14 @@ #ifdef ENABLE_KEYMAPPER #include "common/config-manager.h" +#include "common/system.h" namespace Common { +// These magic numbers are provided by fuzzie and WebOS +static const uint32 kDelayKeyboardEventMillis = 250; +static const uint32 kDelayMouseEventMillis = 50; + void Keymapper::Domain::addKeymap(Keymap *map) { iterator it = find(map->getName()); @@ -54,7 +59,7 @@ Keymap *Keymapper::Domain::getKeymap(const String& name) { } Keymapper::Keymapper(EventManager *evtMgr) - : _eventMan(evtMgr), _enabled(true), _hardwareInputs(0) { + : _eventMan(evtMgr), _enabled(true), _remapping(false), _hardwareInputs(0), _actionToRemap(0) { ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kKeymapperDomain); _globalDomain.setConfigDomain(confDom); @@ -183,13 +188,16 @@ List<Event> Keymapper::mapEvent(const Event &ev, EventSource *source) { if (source && !source->allowMapping()) { return DefaultEventMapper::mapEvent(ev, source); } - List<Event> mappedEvents; - if (ev.type == Common::EVENT_KEYDOWN) + if (_remapping) + mappedEvents = remap(ev); + else if (ev.type == Common::EVENT_KEYDOWN) mappedEvents = mapKeyDown(ev.kbd); else if (ev.type == Common::EVENT_KEYUP) mappedEvents = mapKeyUp(ev.kbd); + else if (ev.type == Common::EVENT_CUSTOM_BACKEND_HARDWARE) + mappedEvents = mapNonKey(ev.customType); if (!mappedEvents.empty()) return mappedEvents; @@ -197,6 +205,13 @@ List<Event> Keymapper::mapEvent(const Event &ev, EventSource *source) { return DefaultEventMapper::mapEvent(ev, source); } +void Keymapper::startRemappingMode(Action *actionToRemap) { + assert(!_remapping); + + _remapping = true; + _actionToRemap = actionToRemap; +} + List<Event> Keymapper::mapKeyDown(const KeyState& key) { return mapKey(key, true); } @@ -236,7 +251,30 @@ List<Event> Keymapper::mapKey(const KeyState& key, bool keyDown) { if (!action) return List<Event>(); - return executeAction(action, keyDown); + return executeAction(action, keyDown ? kIncomingKeyDown : kIncomingKeyUp); +} + + +List<Event> Keymapper::mapNonKey(const HardwareInputCode code) { + if (!_enabled || _activeMaps.empty()) + return List<Event>(); + + Action *action = 0; + + // Search for nonkey in active keymap stack + for (int i = _activeMaps.size() - 1; i >= 0; --i) { + MapRecord mr = _activeMaps[i]; + debug(5, "Keymapper::mapKey keymap: %s", mr.keymap->getName().c_str()); + action = mr.keymap->getMappedAction(code); + + if (action || !mr.transparent) + break; + } + + if (!action) + return List<Event>(); + + return executeAction(action); } Action *Keymapper::getAction(const KeyState& key) { @@ -245,56 +283,108 @@ Action *Keymapper::getAction(const KeyState& key) { return action; } -List<Event> Keymapper::executeAction(const Action *action, bool keyDown) { +List<Event> Keymapper::executeAction(const Action *action, IncomingEventType incomingType) { List<Event> mappedEvents; List<Event>::const_iterator it; - + Event evt; for (it = action->events.begin(); it != action->events.end(); ++it) { - Event evt = *it; - - switch (evt.type) { - case EVENT_KEYDOWN: - if (!keyDown) evt.type = EVENT_KEYUP; - break; - case EVENT_KEYUP: - if (keyDown) evt.type = EVENT_KEYDOWN; - break; - case EVENT_LBUTTONDOWN: - if (!keyDown) evt.type = EVENT_LBUTTONUP; - break; - case EVENT_LBUTTONUP: - if (keyDown) evt.type = EVENT_LBUTTONDOWN; - break; - case EVENT_RBUTTONDOWN: - if (!keyDown) evt.type = EVENT_RBUTTONUP; - break; - case EVENT_RBUTTONUP: - if (keyDown) evt.type = EVENT_RBUTTONDOWN; - break; - case EVENT_MBUTTONDOWN: - if (!keyDown) evt.type = EVENT_MBUTTONUP; - break; - case EVENT_MBUTTONUP: - if (keyDown) evt.type = EVENT_MBUTTONDOWN; - break; - case EVENT_MAINMENU: - if (!keyDown) evt.type = EVENT_MAINMENU; - break; - default: - // don't deliver other events on key up - if (!keyDown) continue; + evt = Event(*it); + EventType convertedType = convertDownToUp(evt.type); + + // hardware keys need to send up instead when they are up + if (incomingType == kIncomingKeyUp) { + if (convertedType == EVENT_INVALID) + continue; // don't send any non-down-converted events on up they were already sent on down + evt.type = convertedType; } evt.mouse = _eventMan->getMousePos(); - mappedEvents.push_back(evt); + + // Check if the event is coming from a non-key hardware event + // that is mapped to a key event + if (incomingType == kIncomingNonKey && convertedType != EVENT_INVALID) + // WORKAROUND: Delay the down events coming from non-key hardware events + // with a zero delay. This is to prevent DOWN1 DOWN2 UP1 UP2. + addDelayedEvent(0, evt); + else + mappedEvents.push_back(evt); + + // non-keys need to send up as well + if (incomingType == kIncomingNonKey && convertedType != EVENT_INVALID) { + // WORKAROUND: Delay the up events coming from non-key hardware events + // This is for engines that run scripts that check on key being down + evt.type = convertedType; + const uint32 delay = (convertedType == EVENT_KEYUP ? kDelayKeyboardEventMillis : kDelayMouseEventMillis); + addDelayedEvent(delay, evt); + } } return mappedEvents; } +EventType Keymapper::convertDownToUp(EventType type) { + EventType result = EVENT_INVALID; + switch (type) { + case EVENT_KEYDOWN: + result = EVENT_KEYUP; + break; + case EVENT_LBUTTONDOWN: + result = EVENT_LBUTTONUP; + break; + case EVENT_RBUTTONDOWN: + result = EVENT_RBUTTONUP; + break; + case EVENT_MBUTTONDOWN: + result = EVENT_MBUTTONUP; + break; + default: + break; + } + return result; +} + const HardwareInput *Keymapper::findHardwareInput(const KeyState& key) { return (_hardwareInputs) ? _hardwareInputs->findHardwareInput(key) : 0; } +const HardwareInput *Keymapper::findHardwareInput(const HardwareInputCode code) { + return (_hardwareInputs) ? _hardwareInputs->findHardwareInput(code) : 0; +} + +List<Event> Keymapper::remap(const Event &ev) { + assert(_remapping); + assert(_actionToRemap); + + List<Event> list; + + const HardwareInput *hwInput = 0; + Event mappedEvent; + + switch (ev.type) { + case EVENT_KEYDOWN: + // eat the event by returning an event invalid + mappedEvent.type = EVENT_INVALID; + list.push_back(mappedEvent); + break; + case EVENT_KEYUP: + hwInput = findHardwareInput(ev.kbd); + break; + case EVENT_CUSTOM_BACKEND_HARDWARE: + hwInput = findHardwareInput(ev.customType); + break; + default: + break; + } + if (hwInput) { + _actionToRemap->mapInput(hwInput); + _actionToRemap->getParent()->saveMappings(); + _remapping = false; + _actionToRemap = 0; + mappedEvent.type = EVENT_GUI_REMAP_COMPLETE_ACTION; + list.push_back(mappedEvent); + } + return list; +} + } // End of namespace Common #endif // #ifdef ENABLE_KEYMAPPER diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index daa746f379..1e8d1c08c3 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -149,6 +149,7 @@ public: * @return mapped events */ List<Event> mapKey(const KeyState& key, bool keyDown); + List<Event> mapNonKey(const HardwareInputCode code); /** * @brief Map a key down event. @@ -168,16 +169,45 @@ public: void setEnabled(bool enabled) { _enabled = enabled; } /** + * @brief Activate remapping mode + * While this mode is active, any mappable event will be bound to the action + * provided. + * @param actionToRemap Action that is the target of the remap + */ + void startRemappingMode(Action *actionToRemap); + + /** + * @brief Force-stop the remapping mode + */ + void stopRemappingMode() { _remapping = false; } + + /** + * Query whether the keymapper is currently in the remapping mode + */ + bool isRemapping() const { return _remapping; } + + /** * Return a HardwareInput pointer for the given key state */ const HardwareInput *findHardwareInput(const KeyState& key); + /** + * Return a HardwareInput pointer for the given input code + */ + const HardwareInput *findHardwareInput(const HardwareInputCode code); + Domain& getGlobalDomain() { return _globalDomain; } Domain& getGameDomain() { return _gameDomain; } const Stack<MapRecord>& getActiveStack() const { return _activeMaps; } private: + enum IncomingEventType { + kIncomingKeyDown, + kIncomingKeyUp, + kIncomingNonKey + }; + void initKeymap(Domain &domain, Keymap *keymap); Domain _globalDomain; @@ -188,12 +218,16 @@ private: void pushKeymap(Keymap *newMap, bool transparent, bool global); Action *getAction(const KeyState& key); - List<Event> executeAction(const Action *act, bool keyDown); + List<Event> executeAction(const Action *act, IncomingEventType incomingType = kIncomingNonKey); + EventType convertDownToUp(EventType eventType); + List<Event> remap(const Event &ev); EventManager *_eventMan; bool _enabled; + bool _remapping; + Action *_actionToRemap; Stack<MapRecord> _activeMaps; HashMap<KeyState, Action *> _keysDown; diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index dab295219a..009c2201a9 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -39,7 +39,7 @@ enum { }; RemapDialog::RemapDialog() - : Dialog("KeyMapper"), _keymapTable(0), _activeRemapAction(0), _topAction(0), _remapTimeout(0), _topKeymapIsGui(false) { + : Dialog("KeyMapper"), _keymapTable(0), _topAction(0), _remapTimeout(0), _topKeymapIsGui(false) { _keymapper = g_system->getEventManager()->getKeymapper(); assert(_keymapper); @@ -243,16 +243,14 @@ void RemapDialog::clearMapping(uint i) { return; debug(3, "clear the mapping %u", i); - _activeRemapAction = _currentActions[_topAction + i].action; - _activeRemapAction->mapInput(0); - _activeRemapAction->getParent()->saveMappings(); + Action *activeRemapAction = _currentActions[_topAction + i].action; + activeRemapAction->mapInput(0); + activeRemapAction->getParent()->saveMappings(); _changes = true; // force refresh - _topAction = -1; + stopRemapping(true); refreshKeymap(); - - _activeRemapAction = 0; } void RemapDialog::startRemapping(uint i) { @@ -260,57 +258,56 @@ void RemapDialog::startRemapping(uint i) { return; _remapTimeout = g_system->getMillis() + kRemapTimeoutDelay; - _activeRemapAction = _currentActions[_topAction + i].action; + Action *activeRemapAction = _currentActions[_topAction + i].action; _keymapWidgets[i].keyButton->setLabel("..."); _keymapWidgets[i].keyButton->draw(); - _keymapper->setEnabled(false); + _keymapper->startRemappingMode(activeRemapAction); } -void RemapDialog::stopRemapping() { +void RemapDialog::stopRemapping(bool force) { _topAction = -1; refreshKeymap(); - _activeRemapAction = 0; - - _keymapper->setEnabled(true); + if (force) + _keymapper->stopRemappingMode(); } void RemapDialog::handleKeyDown(Common::KeyState state) { - if (_activeRemapAction) + if (_keymapper->isRemapping()) return; GUI::Dialog::handleKeyDown(state); } void RemapDialog::handleKeyUp(Common::KeyState state) { - if (_activeRemapAction) { - const HardwareInput *hwInput = _keymapper->findHardwareInput(state); + if (_keymapper->isRemapping()) + return; - debug(4, "RemapDialog::handleKeyUp Key: %d, %d (%c), %x", state.keycode, state.ascii, (state.ascii ? state.ascii : ' '), state.flags); + GUI::Dialog::handleKeyUp(state); +} - if (hwInput) { - _activeRemapAction->mapInput(hwInput); - _activeRemapAction->getParent()->saveMappings(); - _changes = true; - stopRemapping(); - } +void RemapDialog::handleOtherEvent(Event ev) { + if (ev.type == EVENT_GUI_REMAP_COMPLETE_ACTION) { + // _keymapper is telling us that something changed + _changes = true; + stopRemapping(); } else { - GUI::Dialog::handleKeyUp(state); + GUI::Dialog::handleOtherEvent(ev); } } void RemapDialog::handleMouseDown(int x, int y, int button, int clickCount) { - if (_activeRemapAction) + if (_keymapper->isRemapping()) stopRemapping(); else Dialog::handleMouseDown(x, y, button, clickCount); } void RemapDialog::handleTickle() { - if (_activeRemapAction && g_system->getMillis() > _remapTimeout) - stopRemapping(); + if (_keymapper->isRemapping() && g_system->getMillis() > _remapTimeout) + stopRemapping(true); Dialog::handleTickle(); } @@ -354,9 +351,14 @@ void RemapDialog::loadKeymap() { Keymapper::MapRecord mr = activeKeymaps[i]; debug(3, "RemapDialog::loadKeymap keymap: %s", mr.keymap->getName().c_str()); List<const HardwareInput *>::iterator inputIt = freeInputs.begin(); + const HardwareInput *input = *inputIt; while (inputIt != freeInputs.end()) { - Action *act = mr.keymap->getMappedAction((*inputIt)->key); + Action *act = 0; + if (input->type == kHardwareInputTypeKeyboard) + act = mr.keymap->getMappedAction(input->key); + else if (input->type == kHardwareInputTypeGeneric) + act = mr.keymap->getMappedAction(input->inputCode); if (act) { ActionInfo info = {act, true, act->description + " (" + mr.keymap->getName() + ")"}; diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h index 143deca4cf..82c68405db 100644 --- a/backends/keymapper/remap-dialog.h +++ b/backends/keymapper/remap-dialog.h @@ -50,6 +50,7 @@ public: virtual void handleKeyUp(Common::KeyState state); virtual void handleMouseDown(int x, int y, int button, int clickCount); virtual void handleTickle(); + virtual void handleOtherEvent(Common::Event ev); protected: struct ActionWidgets { @@ -67,7 +68,7 @@ protected: void refreshKeymap(); void clearMapping(uint i); void startRemapping(uint i); - void stopRemapping(); + void stopRemapping(bool force = false); Keymapper *_keymapper; Keymap** _keymapTable; @@ -85,7 +86,6 @@ protected: uint _rowCount; Array<ActionWidgets> _keymapWidgets; - Action *_activeRemapAction; uint32 _remapTimeout; static const uint32 kRemapTimeoutDelay = 3000; diff --git a/backends/platform/iphone/iphone_main.mm b/backends/platform/iphone/iphone_main.mm index 20406e6342..e76ffe866e 100644 --- a/backends/platform/iphone/iphone_main.mm +++ b/backends/platform/iphone/iphone_main.mm @@ -41,12 +41,12 @@ void iphone_main(int argc, char *argv[]); - (void)didRotate:(NSNotification *)notification; @end -static int gArgc; -static char **gArgv; +static int g_argc; +static char **g_argv; int main(int argc, char **argv) { - gArgc = argc; - gArgv = argv; + g_argc = argc; + g_argv = argv; NSAutoreleasePool *autoreleasePool = [ [NSAutoreleasePool alloc] init @@ -69,7 +69,7 @@ int main(int argc, char **argv) { - (void)mainLoop:(id)param { [[NSAutoreleasePool alloc] init]; - iphone_main(gArgc, gArgv); + iphone_main(g_argc, g_argv); exit(0); } diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h index 55a4acb7c7..1405fe35f1 100644 --- a/backends/platform/iphone/iphone_video.h +++ b/backends/platform/iphone/iphone_video.h @@ -67,6 +67,9 @@ GLfloat _mouseScaleX, _mouseScaleY; int _scaledShakeOffsetY; + + UITouch *_firstTouch; + UITouch *_secondTouch; } - (id)initWithFrame:(struct CGRect)frame; diff --git a/backends/platform/iphone/iphone_video.mm b/backends/platform/iphone/iphone_video.mm index 04aaf59b21..5b78237ff7 100644 --- a/backends/platform/iphone/iphone_video.mm +++ b/backends/platform/iphone/iphone_video.mm @@ -28,17 +28,14 @@ #include "graphics/colormasks.h" iPhoneView *g_iPhoneViewInstance = nil; -static int _fullWidth; -static int _fullHeight; +static int g_fullWidth; +static int g_fullHeight; -static int _needsScreenUpdate = 0; - -static UITouch *_firstTouch = NULL; -static UITouch *_secondTouch = NULL; +static int g_needsScreenUpdate = 0; #if 0 -static long lastTick = 0; -static int frames = 0; +static long g_lastTick = 0; +static int g_frames = 0; #endif #define printOpenGLError() printOglError(__FILE__, __LINE__) @@ -57,13 +54,13 @@ int printOglError(const char *file, int line) { } bool iPhone_isHighResDevice() { - return _fullHeight > 480; + return g_fullHeight > 480; } void iPhone_updateScreen() { //printf("Mouse: (%i, %i)\n", mouseX, mouseY); - if (!_needsScreenUpdate) { - _needsScreenUpdate = 1; + if (!g_needsScreenUpdate) { + g_needsScreenUpdate = 1; [g_iPhoneViewInstance performSelectorOnMainThread:@selector(updateSurface) withObject:nil waitUntilDone: NO]; } } @@ -142,7 +139,7 @@ const char *iPhone_getDocumentsDir() { glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, _viewRenderbuffer); printOpenGLError(); // Retrieve the render buffer size. This *should* match the frame size, - // i.e. _fullWidth and _fullHeight. + // i.e. g_fullWidth and g_fullHeight. glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &_renderBufferWidth); printOpenGLError(); glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &_renderBufferHeight); printOpenGLError(); @@ -185,8 +182,8 @@ const char *iPhone_getDocumentsDir() { } } - _fullWidth = (int)frame.size.width; - _fullHeight = (int)frame.size.height; + g_fullWidth = (int)frame.size.width; + g_fullHeight = (int)frame.size.height; g_iPhoneViewInstance = self; @@ -197,6 +194,9 @@ const char *iPhone_getDocumentsDir() { _scaledShakeOffsetY = 0; + _firstTouch = NULL; + _secondTouch = NULL; + _gameScreenVertCoords[0] = _gameScreenVertCoords[1] = _gameScreenVertCoords[2] = _gameScreenVertCoords[3] = _gameScreenVertCoords[4] = _gameScreenVertCoords[5] = @@ -234,8 +234,6 @@ const char *iPhone_getDocumentsDir() { } - (void)dealloc { - [super dealloc]; - if (_keyboardView != nil) { [_keyboardView dealloc]; } @@ -243,19 +241,21 @@ const char *iPhone_getDocumentsDir() { _videoContext.screenTexture.free(); _videoContext.overlayTexture.free(); _videoContext.mouseTexture.free(); + + [super dealloc]; } - (void)drawRect:(CGRect)frame { #if 0 - if (lastTick == 0) { - lastTick = time(0); + if (g_lastTick == 0) { + g_lastTick = time(0); } - frames++; - if (time(0) > lastTick) { - lastTick = time(0); - printf("FPS: %i\n", frames); - frames = 0; + g_frames++; + if (time(0) > g_lastTick) { + g_lastTick = time(0); + printf("FPS: %i\n", g_frames); + g_frames = 0; } #endif } @@ -289,10 +289,10 @@ const char *iPhone_getDocumentsDir() { } - (void)updateSurface { - if (!_needsScreenUpdate) { + if (!g_needsScreenUpdate) { return; } - _needsScreenUpdate = 0; + g_needsScreenUpdate = 0; glClear(GL_COLOR_BUFFER_BIT); printOpenGLError(); diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index f3e0d97b97..9a33cd8968 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -60,7 +60,7 @@ OSystem_IPHONE::OSystem_IPHONE() : _screenOrientation(kScreenOrientationFlippedLandscape), _mouseClickAndDragEnabled(false), _gestureStartX(-1), _gestureStartY(-1), _fullScreenIsDirty(false), _fullScreenOverlayIsDirty(false), _mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0), - _mouseCursorPaletteEnabled(false) { + _mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) { _queuedInputEvent.type = Common::EVENT_INVALID; _touchpadModeEnabled = !iPhone_isHighResDevice(); _fsFactory = new POSIXFilesystemFactory(); diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index 5d0f60c34c..b443e22f56 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -65,6 +65,9 @@ protected: Graphics::Surface _framebuffer; + // For signaling that screen format set up might have failed. + TransactionError _gfxTransactionError; + // For use with the game texture uint16 _gamePalette[256]; // For use with the mouse texture diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm index 2b5e78bd35..6f80a6cba3 100644 --- a/backends/platform/iphone/osys_video.mm +++ b/backends/platform/iphone/osys_video.mm @@ -84,6 +84,13 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm // to the texture buffer to avoid an additional copy step. [g_iPhoneViewInstance performSelectorOnMainThread:@selector(createScreenTexture) withObject:nil waitUntilDone: YES]; + // In case the client code tries to set up a non supported mode, we will + // fall back to CLUT8 and set the transaction error accordingly. + if (format && format->bytesPerPixel != 1 && *format != _videoContext->screenTexture.format) { + format = 0; + _gfxTransactionError = kTransactionFormatNotSupported; + } + if (!format || format->bytesPerPixel == 1) { _framebuffer.create(width, height, Graphics::PixelFormat::createFormatCLUT8()); } else { @@ -92,7 +99,6 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm format->rLoss, format->gLoss, format->bLoss, format->aLoss, format->rShift, format->gShift, format->bShift, format->aShift); #endif - assert(_videoContext->screenTexture.format == *format); // We directly draw on the screen texture in hi-color mode. Thus // we copy over its settings here and just replace the width and // height to avoid any problems. @@ -107,6 +113,7 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm } void OSystem_IPHONE::beginGFXTransaction() { + _gfxTransactionError = kTransactionSuccess; } OSystem::TransactionError OSystem_IPHONE::endGFXTransaction() { @@ -114,8 +121,7 @@ OSystem::TransactionError OSystem_IPHONE::endGFXTransaction() { updateOutputSurface(); [g_iPhoneViewInstance performSelectorOnMainThread:@selector(setGraphicsMode) withObject:nil waitUntilDone: YES]; - // TODO: Can we return better error codes? - return kTransactionSuccess; + return _gfxTransactionError; } void OSystem_IPHONE::updateOutputSurface() { diff --git a/backends/platform/ps2/icon.h b/backends/platform/ps2/icon.h index bc614bf70b..3ad19910d3 100644 --- a/backends/platform/ps2/icon.h +++ b/backends/platform/ps2/icon.h @@ -22,10 +22,6 @@ class PS2Icon { public: - PS2Icon() {}; - - ~PS2Icon() {}; - uint16 decompressData(uint16 **data); void setup(mcIcon *icon); }; diff --git a/backends/platform/psp/default_display_client.h b/backends/platform/psp/default_display_client.h index e1cd8e7e72..721a7e6fea 100644 --- a/backends/platform/psp/default_display_client.h +++ b/backends/platform/psp/default_display_client.h @@ -65,9 +65,6 @@ protected: */ class Overlay : public DefaultDisplayClient { public: - Overlay() {} - ~Overlay() {} - void init(); bool allocate(); void setBytesPerPixel(uint32 size); @@ -85,7 +82,6 @@ public: memset(&_pixelFormat, 0, sizeof(_pixelFormat)); memset(&_frameBuffer, 0, sizeof(_frameBuffer)); } - ~Screen() {} void init(); bool allocate(); diff --git a/common/EventDispatcher.cpp b/common/EventDispatcher.cpp index 4c7286bbb5..012a2dfce5 100644 --- a/common/EventDispatcher.cpp +++ b/common/EventDispatcher.cpp @@ -60,6 +60,12 @@ void EventDispatcher::dispatch() { } } } + + List<Event> delayedEvents = _mapper->getDelayedEvents(); + for (List<Event>::iterator k = delayedEvents.begin(); k != delayedEvents.end(); ++k) { + const Event delayedEvent = *k; + dispatchEvent(delayedEvent); + } } void EventDispatcher::registerMapper(EventMapper *mapper) { diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp index 2808a7b5fd..47db61e472 100644 --- a/common/EventMapper.cpp +++ b/common/EventMapper.cpp @@ -22,6 +22,9 @@ #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" + namespace Common { List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) { @@ -46,9 +49,44 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) { // if it didn't get mapped, just pass it through if (mappedEvent.type == EVENT_INVALID) mappedEvent = ev; + +#ifdef ENABLE_VKEYBD + // TODO: this check is not needed post-split + if (mappedEvent.type == EVENT_CUSTOM_BACKEND_HARDWARE) { + warning("EVENT_CUSTOM_BACKEND_HARDWARE was not mapped"); + return List<Event>(); + } +#endif + events.push_back(mappedEvent); return events; } +void DefaultEventMapper::addDelayedEvent(uint32 millis, Event ev) { + if (_delayedEvents.empty()) { + _delayedEffectiveTime = g_system->getMillis() + millis; + millis = 0; + } + DelayedEventsEntry entry = DelayedEventsEntry(millis, ev); + _delayedEvents.push(entry); +} + +List<Event> DefaultEventMapper::getDelayedEvents() { + List<Event> events; + + if (_delayedEvents.empty()) + return events; + + uint32 now = g_system->getMillis(); + + while (!_delayedEvents.empty() && now >= _delayedEffectiveTime) { + DelayedEventsEntry entry = _delayedEvents.pop(); + if (!_delayedEvents.empty()) + _delayedEffectiveTime += _delayedEvents.front().timerOffset; + events.push_back(entry.event); + } + return events; +} + } // namespace Common diff --git a/common/events.h b/common/events.h index 4efdd67b91..7366c51d36 100644 --- a/common/events.h +++ b/common/events.h @@ -79,6 +79,8 @@ enum EventType { // IMPORTANT NOTE: This is part of the WIP Keymapper. If you plan to use // this, please talk to tsoliman and/or LordHoto. EVENT_CUSTOM_BACKEND_ACTION = 18, + EVENT_CUSTOM_BACKEND_HARDWARE = 21, + EVENT_GUI_REMAP_COMPLETE_ACTION = 22, EVENT_KEYMAPPER_REMAP = 19 #endif #ifdef ENABLE_VKEYBD @@ -230,12 +232,27 @@ public: * Map an incoming event to one or more action events */ virtual List<Event> mapEvent(const Event &ev, EventSource *source) = 0; + + virtual List<Event> getDelayedEvents() = 0; }; class DefaultEventMapper : public EventMapper { public: + DefaultEventMapper() : _delayedEvents(), _delayedEffectiveTime(0) {} // EventMapper interface virtual List<Event> mapEvent(const Event &ev, EventSource *source); + virtual List<Event> getDelayedEvents(); +protected: + virtual void addDelayedEvent(uint32 millis, Event ev); + + struct DelayedEventsEntry { + const uint32 timerOffset; + const Event event; + DelayedEventsEntry(const uint32 offset, const Event ev) : timerOffset(offset), event(ev) { } + }; + + Queue<DelayedEventsEntry> _delayedEvents; + uint32 _delayedEffectiveTime; }; /** diff --git a/common/macresman.cpp b/common/macresman.cpp index 1317600cb7..14bdfa7080 100644 --- a/common/macresman.cpp +++ b/common/macresman.cpp @@ -238,6 +238,27 @@ bool MacResManager::open(FSNode path, String filename) { return false; } +bool MacResManager::exists(const String &filename) { + // Try the file name by itself + if (Common::File::exists(filename)) + return true; + + // Try the .rsrc extension + if (Common::File::exists(filename + ".rsrc")) + return true; + + // Check if we have a MacBinary file + Common::File tempFile; + if (tempFile.open(filename + ".bin") && isMacBinary(tempFile)) + return true; + + // Check if we have an AppleDouble file + if (tempFile.open("._" + filename) && tempFile.readUint32BE() == 0x00051607) + return true; + + return false; +} + bool MacResManager::loadFromAppleDouble(SeekableReadStream &stream) { if (stream.readUint32BE() != 0x00051607) // tag return false; diff --git a/common/macresman.h b/common/macresman.h index 4d86e46d11..6820106925 100644 --- a/common/macresman.h +++ b/common/macresman.h @@ -69,6 +69,13 @@ public: bool open(FSNode path, String filename); /** + * See if a Mac data/resource fork pair exists. + * @param filename The base file name of the file + * @return True if either a data fork or resource fork with this name exists + */ + static bool exists(const String &filename); + + /** * Close the Mac data/resource fork pair. */ void close(); diff --git a/common/stream.cpp b/common/stream.cpp index 30b3bca497..85647bfe3a 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -240,7 +240,7 @@ bool SeekableSubReadStream::seek(int32 offset, int whence) { return ret; } -uint32 SafeSubReadStream::read(void *dataPtr, uint32 dataSize) { +uint32 SafeSeekableSubReadStream::read(void *dataPtr, uint32 dataSize) { // Make sure the parent stream is at the right position seek(0, SEEK_CUR); diff --git a/common/substream.h b/common/substream.h index 7e67389da1..01686529aa 100644 --- a/common/substream.h +++ b/common/substream.h @@ -99,21 +99,24 @@ public: * normal SeekableSubReadStream, at the cost of seek()ing the parent stream * before each read(). * - * More than one SafeSubReadStream to the same parent stream can be used + * More than one SafeSeekableSubReadStream to the same parent stream can be used * at the same time; they won't mess up each other. They will, however, * reposition the parent stream, so don't depend on its position to be - * the same after a read() or seek() on one of its SafeSubReadStream. + * the same after a read() or seek() on one of its SafeSeekableSubReadStream. + * + * Note that this stream is *not* threading safe. Calling read from the audio + * thread and from the main thread might mess up the data retrieved. */ -class SafeSubReadStream : public SeekableSubReadStream { +class SafeSeekableSubReadStream : public SeekableSubReadStream { public: - SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO) : - SeekableSubReadStream(parentStream, begin, end, disposeParentStream) { + SafeSeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO) + : SeekableSubReadStream(parentStream, begin, end, disposeParentStream) { } - virtual uint32 read(void *dataPtr, uint32 dataSize); + virtual uint32 read(void *dataPtr, uint32 dataSize); }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/translation.cpp b/common/translation.cpp index 219fce8794..2bc31c617b 100644 --- a/common/translation.cpp +++ b/common/translation.cpp @@ -232,8 +232,9 @@ bool TranslationManager::openTranslationsFile(File &inFile) { ArchiveMemberList fileList; SearchMan.listMatchingMembers(fileList, "translations.dat"); for (ArchiveMemberList::iterator it = fileList.begin(); it != fileList.end(); ++it) { - SeekableReadStream *stream = it->get()->createReadStream(); - if (stream && inFile.open(stream, it->get()->getName())) { + ArchiveMember const &m = **it; + SeekableReadStream *const stream = m.createReadStream(); + if (stream && inFile.open(stream, m.getName())) { if (checkHeader(inFile)) return true; inFile.close(); diff --git a/devtools/create_translations/cp_parser.cpp b/devtools/create_translations/cp_parser.cpp index a4202bf153..f5e4c9d6bb 100644 --- a/devtools/create_translations/cp_parser.cpp +++ b/devtools/create_translations/cp_parser.cpp @@ -42,9 +42,11 @@ Codepage *parseCodepageMapping(const std::string &filename) { size_t start = filename.find_last_of("/\\"); if (start == std::string::npos) start = 0; + else + ++start; // Strip off the filename extension const size_t pos = filename.find_last_of('.'); - const std::string charset(filename.substr(start + 1, pos != std::string::npos ? (pos - start - 1) : std::string::npos)); + const std::string charset(filename.substr(start, pos != std::string::npos ? (pos - start) : std::string::npos)); std::ifstream in(filename.c_str()); if (!in) { diff --git a/devtools/credits.pl b/devtools/credits.pl index 8330450984..b3a506125f 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -915,6 +915,9 @@ begin_credits("Credits"); begin_persons(); add_person("Thierry Crozat", "criezy", "Translation Lead"); end_persons(); + begin_section("Basque"); + add_person("Mikel Iturbe Urretxa", "", ""); + end_section(); begin_section("Catalan"); add_person("Jordi Vilalta Prat", "jvprat", ""); end_section(); diff --git a/doc/cz/PrectiMe b/doc/cz/PrectiMe index da54d473e1..cb2484299b 100644 --- a/doc/cz/PrectiMe +++ b/doc/cz/PrectiMe @@ -387,6 +387,10 @@ Pokyny pro hry Broken Sword jsou pro verze od Sold-Out Software, kde kaХОdУЁ hra ------ ------------------------- Videa pro hry Broken Sword majУ vТ sobФ trochu historie (viz dalХЁУ oddУl, pokud jste zvФdavУ), ale obecnФ jedinУЉ, co potХebujete udФlat, je zkopУrovat soubory .SMK ze sloХОek "SMACKS" nebo "SMACKSHI" na CD do stejnУЉ sloХОky jako ostatnУ datovУЉ soubory hry. (Broken Sword mУЁ takУЉ sloХОku "SMACKSLO" se stejnУНmi videi, ale ty jsouТ niХОХЁУ kvality.) MХЏХОete je umУstit do podsloХОky sТ nУЁzvem "video", pokud VУЁm to pХijde hezФУ. +Ve verzУch pro PlayStation, mХЏХОete pХЏvodnУ videa vypsat z disku. KaХОdУН soubor, kterУН mУЁ pХУponu "STR", byste mФli vypsat jako *Фist* sektory z disku (vХЁech 2352 bajtХЏ na sektor). MХЏХОete takУЉ mУst toho pouХОУt pХeformУЁtovanУЁ videa, kterУЁ jsou zmУnФna nУХОe, ale to nebude fungovat pro vХЁechny videa v Broken Sword II. Pro vУce informacУ si prohlУЉdnФte: + + http://wiki.scummvm.org/index.php/HOWTO-PlayStation_Videos + NФkterУЁ vydУЁnУ hry, a takУЉ verze pro PlayStation, Smacker videa nemajУ. Revolution Software nУЁm laskavФ dovolilo poskytovat pХeformУЁtovanУЁ videa ke staХОenУ na naХЁУ strУЁnce: http://www.scummvm.org/downloads.php @@ -395,7 +399,7 @@ Tato videa jsou poskytovУЁna ve formУЁtu DXA se zvukem ve formУЁtu FLAC. Jejich Pro systУЉmy, kterУЉ jsou pХУliХЁ pomalУЉ, aby zvlУЁdli dekУГdovat formУЁt FLAC byl zvuk videУ takУЉ poskytnut oddФlenФ ve formУЁtu OGG Vorbis audio. Toto vyХОaduje, aby verze ScummVM byla sestavena sТ podporou libVorbis a zlib. -Pro Broken Sword takУЉ poskytujeme pХУdavek pro titulky. JednoduХЁe ho rozbalte a nУЁsledujte pokyny v souboru readme.txt. (Broken Sword II jiХО titulky mУЁ; nenУ tХeba dalХЁУ prУЁce pro jejich pХidУЁnУ.) +Pro Broken Sword takУЉ poskytujeme pХУdavek pro titulky. JednoduХЁe ho rozbalte a nУЁsledujte pokyny v souboru readme.txt. BalУФek vТ souФasnosti nefunguje ve videУch na PlayStation. (Broken Sword II jiХО titulky mУЁ; nenУ tХeba dalХЁУ prУЁce pro jejich pХidУЁnУ.) 3.7.2) Videa her Broken Sword ve zpФtnУЉm pohledu: @@ -1615,3 +1619,4 @@ TУНm ScummVM. http://www.scummvm.org/ ------------------------------------------------------------------------ + diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index d43462b81d..0cec039b5e 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -171,18 +171,13 @@ protected: /** * Name of single gameid (optional). * - * If set, the target ID will always be set to this one. Currently, it is a - * necessary evil to avoid polluting the global namespace with loads of IDs. - * Needed for engines that define a lot of game targets, so that there won't - * be a situation where two different engines define the same game ID. - * - * FIXME: Remove this field altogether! This is a temporary (and ugly) - * workaround to a more generic problem. - * - * TODO: A more correct way to do this would be to distinguish targets with - * a singleid-gameid combination, so that there will never be a duplicate - * game ID across different engines. + * Used to override gameid. + * This is a recommended setting to prevent global gameid pollution. + * With this option set, the gameid effectively turns into engineid. * + * FIXME: This field actually removes a feature (gameid) in order to + * address a more generic problem. We should find a better way to + * disambiguate gameids. */ const char *_singleid; diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp index 37f4eb070e..309b89bdda 100644 --- a/engines/cge/bitmap.cpp +++ b/engines/cge/bitmap.cpp @@ -158,7 +158,7 @@ BitmapPtr Bitmap::code() { debugC(1, kCGEDebugBitmap, "Bitmap::code()"); if (!_m) - return false; + return NULL; uint16 cnt; diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index 9c02cd74ad..af55d0c72c 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -89,7 +89,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam _speechCount = 0; _charShift = 0; _kerning = 0; - _brightness = 0; + _brightPalette = false; _roomLoaded = 0; _didZoom = 0; _lineSpacing = 10; @@ -366,7 +366,9 @@ Common::Error DreamWebEngine::run() { _console = new DreamWebConsole(this); ConfMan.registerDefault("dreamweb_originalsaveload", "false"); + ConfMan.registerDefault("bright_palette", true); _hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute"); + _brightPalette = ConfMan.getBool("bright_palette"); _timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync"); dreamweb(); diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index e80b5538ad..13a27449dc 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -341,7 +341,7 @@ public: uint8 _speechCount; uint16 _charShift; uint8 _kerning; - uint8 _brightness; + bool _brightPalette; uint8 _roomLoaded; uint8 _didZoom; uint16 _lineSpacing; @@ -952,7 +952,6 @@ public: void screenUpdate(); void startup1(); void readOneBlock(); - void seeCommandTail(); bool checkIfPerson(uint8 x, uint8 y); bool checkIfFree(uint8 x, uint8 y); bool checkIfEx(uint8 x, uint8 y); diff --git a/engines/dreamweb/module.mk b/engines/dreamweb/module.mk index 661a9b973a..6bc4f8728e 100644 --- a/engines/dreamweb/module.mk +++ b/engines/dreamweb/module.mk @@ -12,6 +12,7 @@ MODULE_OBJS := \ pathfind.o \ people.o \ print.o \ + rain.o \ saveload.o \ sound.o \ sprite.o \ diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp index cdef60e94d..95aa400c3a 100644 --- a/engines/dreamweb/monitor.cpp +++ b/engines/dreamweb/monitor.cpp @@ -320,7 +320,7 @@ void DreamWebEngine::randomAccess(uint16 count) { for (uint16 i = 0; i < count; ++i) { vSync(); vSync(); - uint16 v = randomNumber() & 15; + uint16 v = _rnd.getRandomNumber(15); if (v < 10) accessLightOff(); else diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index 316a1689c9..dfb5c62618 100644 --- a/engines/dreamweb/people.cpp +++ b/engines/dreamweb/people.cpp @@ -262,7 +262,7 @@ void DreamWebEngine::gamer(ReelRoutine &routine) { if (checkSpeed(routine)) { uint8 v; do { - v = 20 + randomNumber() % 5; + v = _rnd.getRandomNumberRng(20, 24); } while (v == routine.reelPointer()); routine.setReelPointer(v); } diff --git a/engines/dreamweb/rain.cpp b/engines/dreamweb/rain.cpp new file mode 100644 index 0000000000..7db4744cbf --- /dev/null +++ b/engines/dreamweb/rain.cpp @@ -0,0 +1,194 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "dreamweb/dreamweb.h" + +namespace DreamWeb { + +void DreamWebEngine::showRain() { + Common::List<Rain>::iterator i; + + // Do nothing if there's no rain at all + if (_rainList.empty()) + return; + + const uint8 *frameData = _mainSprites.getFrameData(58); + + for (i = _rainList.begin(); i != _rainList.end(); ++i) { + Rain &rain = *i; + uint16 y = rain.y + _mapAdY + _mapYStart; + uint16 x = rain.x + _mapAdX + _mapXStart; + uint16 size = rain.size; + uint16 offset = (rain.w3 - rain.b5) & 511; + rain.w3 = offset; + const uint8 *src = frameData + offset; + uint8 *dst = workspace() + y * 320 + x; + for (uint16 j = 0; j < size; ++j) { + uint8 v = src[j]; + if (v != 0) + *dst = v; + dst += 320-1; // advance diagonally + } + } + + if (_channel1Playing != 255) + return; + if (_realLocation == 2 && _vars._beenMugged != 1) + return; + if (_realLocation == 55) + return; + + if (randomNumber() >= 1) // play thunder with 1 in 256 chance + return; + + uint8 soundIndex; + if (_channel0Playing != 6) + soundIndex = 4; + else + soundIndex = 7; + playChannel1(soundIndex); +} + +uint8 DreamWebEngine::getBlockOfPixel(uint8 x, uint8 y) { + uint8 flag, flagEx, type, flagX, flagY; + checkOne(x + _mapXStart, y + _mapYStart, &flag, &flagEx, &type, &flagX, &flagY); + if (flag & 1) + return 0; + else + return type; +} + +void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) { + do { + Rain rain; + + // Look for line start + while (!getBlockOfPixel(x, y)) { + --x; + ++y; + if (x == 0 || y >= _mapYSize) + return; + } + + rain.x = x; + rain.y = y; + + uint8 length = 1; + + // Look for line end + while (getBlockOfPixel(x, y)) { + --x; + ++y; + if (x == 0 || y >= _mapYSize) + break; + ++length; + } + + rain.size = length; + rain.w3 = _rnd.getRandomNumber(65535); + rain.b5 = _rnd.getRandomNumberRng(4, 7); + _rainList.push_back(rain); + } while (x > 0 && y < _mapYSize); +} + +struct RainLocation { + uint8 location; + uint8 x, y; + uint8 rainSpacing; +}; + +static const RainLocation rainLocationList[] = { + { 1,44,10,16 }, + { 4,11,30,14 }, + { 4,22,30,14 }, + { 3,33,10,14 }, + { 10,33,30,14 }, + { 10,22,30,24 }, + { 9,22,10,14 }, + { 2,33,0,14 }, + { 2,22,0,14 }, + { 6,11,30,14 }, + { 7,11,20,18 }, + { 7,0,20,18 }, + { 7,0,30,18 }, + { 55,44,0,14 }, + { 5,22,30,14 }, + + { 8,0,10,18 }, + { 8,11,10,18 }, + { 8,22,10,18 }, + { 8,33,10,18 }, + { 8,33,20,18 }, + { 8,33,30,18 }, + { 8,33,40,18 }, + { 8,22,40,18 }, + { 8,11,40,18 }, + + { 21,44,20,18 }, + { 255,0,0,0 } +}; + +void DreamWebEngine::initRain() { + const RainLocation *r = rainLocationList; + _rainList.clear(); + + uint8 rainSpacing = 0; + + // look up location in rainLocationList to determine rainSpacing + for (r = rainLocationList; r->location != 0xff; ++r) { + if (r->location == _realLocation && + r->x == _mapX && r->y == _mapY) { + rainSpacing = r->rainSpacing; + break; + } + } + + if (rainSpacing == 0) { + // location not found in rainLocationList: no rain + return; + } + + // start lines of rain from top of screen + uint8 x = 4; + do { + uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1); + x += delta; + if (x >= _mapXSize) + break; + + splitIntoLines(x, 0); + } while (true); + + // start lines of rain from side of screen + uint8 y = 0; + do { + uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1); + y += delta; + if (y >= _mapYSize) + break; + + splitIntoLines(_mapXSize - 1, y); + } while (true); +} + +} // End of namespace DreamWeb + diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index b1aae5adce..3df324abe1 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -263,8 +263,8 @@ void DreamWebEngine::constant(Sprite *sprite, SetObject *objData) { } void DreamWebEngine::randomSprite(Sprite *sprite, SetObject *objData) { - uint8 r = randomNumber(); - sprite->frameNumber = objData->frames[r&7]; + uint8 r = _rnd.getRandomNumber(7); + sprite->frameNumber = objData->frames[r]; } void DreamWebEngine::doorway(Sprite *sprite, SetObject *objData) { @@ -471,50 +471,6 @@ const Frame *DreamWebEngine::getReelFrameAX(uint16 frame) { return &base->_frames[frame]; } -void DreamWebEngine::showRain() { - Common::List<Rain>::iterator i; - - // Do nothing if there's no rain at all - if (_rainList.empty()) - return; - - const uint8 *frameData = _mainSprites.getFrameData(58); - - for (i = _rainList.begin(); i != _rainList.end(); ++i) { - Rain &rain = *i; - uint16 y = rain.y + _mapAdY + _mapYStart; - uint16 x = rain.x + _mapAdX + _mapXStart; - uint16 size = rain.size; - uint16 offset = (rain.w3 - rain.b5) & 511; - rain.w3 = offset; - const uint8 *src = frameData + offset; - uint8 *dst = workspace() + y * 320 + x; - for (uint16 j = 0; j < size; ++j) { - uint8 v = src[j]; - if (v != 0) - *dst = v; - dst += 320-1; // advance diagonally - } - } - - if (_channel1Playing != 255) - return; - if (_realLocation == 2 && _vars._beenMugged != 1) - return; - if (_realLocation == 55) - return; - - if (randomNumber() >= 1) // play thunder with 1 in 256 chance - return; - - uint8 soundIndex; - if (_channel0Playing != 6) - soundIndex = 4; - else - soundIndex = 7; - playChannel1(soundIndex); -} - void DreamWebEngine::moveMap(uint8 param) { switch (param) { case 32: @@ -545,136 +501,6 @@ void DreamWebEngine::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint *type = tileData._type; } -uint8 DreamWebEngine::getBlockOfPixel(uint8 x, uint8 y) { - uint8 flag, flagEx, type, flagX, flagY; - checkOne(x + _mapXStart, y + _mapYStart, &flag, &flagEx, &type, &flagX, &flagY); - if (flag & 1) - return 0; - else - return type; -} - -void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) { - do { - Rain rain; - - // Look for line start - while (!getBlockOfPixel(x, y)) { - --x; - ++y; - if (x == 0 || y >= _mapYSize) - return; - } - - rain.x = x; - rain.y = y; - - uint8 length = 1; - - // Look for line end - while (getBlockOfPixel(x, y)) { - --x; - ++y; - if (x == 0 || y >= _mapYSize) - break; - ++length; - } - - rain.size = length; - rain.w3 = (randomNumber() << 8) | randomNumber(); - rain.b5 = (randomNumber() & 3) + 4; - _rainList.push_back(rain); - } while (x > 0 && y < _mapYSize); -} - -struct RainLocation { - uint8 location; - uint8 x, y; - uint8 rainSpacing; -}; - -static const RainLocation rainLocationList[] = { - { 1,44,10,16 }, - { 4,11,30,14 }, - { 4,22,30,14 }, - { 3,33,10,14 }, - { 10,33,30,14 }, - { 10,22,30,24 }, - { 9,22,10,14 }, - { 2,33,0,14 }, - { 2,22,0,14 }, - { 6,11,30,14 }, - { 7,11,20,18 }, - { 7,0,20,18 }, - { 7,0,30,18 }, - { 55,44,0,14 }, - { 5,22,30,14 }, - - { 8,0,10,18 }, - { 8,11,10,18 }, - { 8,22,10,18 }, - { 8,33,10,18 }, - { 8,33,20,18 }, - { 8,33,30,18 }, - { 8,33,40,18 }, - { 8,22,40,18 }, - { 8,11,40,18 }, - - { 21,44,20,18 }, - { 255,0,0,0 } -}; - -void DreamWebEngine::initRain() { - const RainLocation *r = rainLocationList; - _rainList.clear(); - - uint8 rainSpacing = 0; - - // look up location in rainLocationList to determine rainSpacing - for (r = rainLocationList; r->location != 0xff; ++r) { - if (r->location == _realLocation && - r->x == _mapX && r->y == _mapY) { - rainSpacing = r->rainSpacing; - break; - } - } - - if (rainSpacing == 0) { - // location not found in rainLocationList: no rain - return; - } - - // start lines of rain from top of screen - uint8 x = 4; - do { - uint8 delta; - do { - delta = (randomNumber() & 31) + 3; - } while (delta >= rainSpacing); - - x += delta; - if (x >= _mapXSize) - break; - - splitIntoLines(x, 0); - } while (true); - - // start lines of rain from side of screen - uint8 y = 0; - do { - uint8 delta; - do { - delta = (randomNumber() & 31) + 3; - } while (delta >= rainSpacing); - - y += delta; - if (y >= _mapYSize) - break; - - splitIntoLines(_mapXSize - 1, y); - } while (true); -} - void DreamWebEngine::intro1Text() { if (_introCount != 2 && _introCount != 4 && _introCount != 6) return; @@ -1192,3 +1018,4 @@ void DreamWebEngine::checkForExit(Sprite *sprite) { } } // End of namespace DreamWeb + diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 8e63774317..9789e20210 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -565,7 +565,6 @@ void DreamWebEngine::dreamweb() { break; } - seeCommandTail(); allocateBuffers(); // setMouse @@ -877,10 +876,6 @@ void DreamWebEngine::hangOnCurs(uint16 frameCount) { } } -void DreamWebEngine::seeCommandTail() { - _brightness = 1; -} - void DreamWebEngine::readMouse() { _oldButton = _mouseButton; uint16 state = readMouseState(); diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index be7d210999..a66f156a1d 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -417,7 +417,7 @@ void DreamWebEngine::loadPalFromIFF() { uint8 *dst = _mainPal; for (size_t i = 0; i < 256*3; ++i) { uint8 c = src[i] / 4; - if (_brightness == 1) { + if (_brightPalette) { if (c) { c = c + c / 2 + c / 4; if (c > 63) diff --git a/engines/gob/anifile.cpp b/engines/gob/anifile.cpp index 1a905f1083..2671fe0405 100644 --- a/engines/gob/anifile.cpp +++ b/engines/gob/anifile.cpp @@ -28,19 +28,11 @@ #include "gob/dataio.h" #include "gob/surface.h" #include "gob/video.h" +#include "gob/cmpfile.h" #include "gob/anifile.h" namespace Gob { -ANIFile::Layer::Layer() : surface(0), coordinates(0) { -} - -ANIFile::Layer::~Layer() { - delete coordinates; - delete surface; -} - - ANIFile::ANIFile(GobEngine *vm, const Common::String &fileName, uint16 width, uint8 bpp) : _vm(vm), _width(width), _bpp(bpp), _hasPadding(false) { @@ -72,6 +64,8 @@ ANIFile::ANIFile(GobEngine *vm, const Common::String &fileName, } ANIFile::~ANIFile() { + for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l) + delete *l; } void ANIFile::load(Common::SeekableSubReadStreamEndian &ani, const Common::String &fileName) { @@ -90,9 +84,9 @@ void ANIFile::load(Common::SeekableSubReadStreamEndian &ani, const Common::Strin if (_hasPadding) ani.skip(1); - _layers.resize(layerCount - 1); - for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l) - loadLayer(*l, ani); + _layers.reserve(layerCount - 1); + for (int i = 0; i < layerCount - 1; i++) + _layers.push_back(loadLayer(ani)); } _maxWidth = 0; @@ -158,14 +152,13 @@ void ANIFile::loadAnimation(Animation &animation, FrameArray &frames, area.right = area.bottom = -0x7FFF; for (ChunkList::const_iterator c = frame.begin(); c != frame.end(); c++) { - const Layer *layer; - const RXYFile::Coordinates *coords; + uint16 cL, cT, cR, cB; - if (!getPart(c->layer, c->part, layer, coords)) + if (!getCoordinates(c->layer, c->part, cL, cT, cR, cB)) continue; - const uint16 width = coords->right - coords->left + 1; - const uint16 height = coords->bottom - coords->top + 1; + const uint16 width = cR - cL + 1; + const uint16 height = cB - cT + 1; const uint16 l = c->x; const uint16 t = c->y; @@ -233,33 +226,12 @@ void ANIFile::loadFrames(FrameArray &frames, Common::SeekableSubReadStreamEndian } } -void ANIFile::loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &ani) { - Common::String file = Util::readString(ani, 13); +CMPFile *ANIFile::loadLayer(Common::SeekableSubReadStreamEndian &ani) { + Common::String file = Util::setExtension(Util::readString(ani, 13), ""); if (_hasPadding) ani.skip(1); - if (file.empty()) - return; - - Common::String fileRXY = Util::setExtension(file, ".RXY"); - Common::String fileCMP = Util::setExtension(file, ".CMP"); - if (!_vm->_dataIO->hasFile(fileRXY) || !_vm->_dataIO->hasFile(fileCMP)) - return; - - loadLayer(layer, fileRXY, fileCMP); -} - -void ANIFile::loadLayer(Layer &layer, const Common::String &fileRXY, - const Common::String &fileCMP) { - - Common::SeekableReadStream *dataRXY = _vm->_dataIO->getFile(fileRXY); - if (!dataRXY) - return; - - layer.coordinates = new RXYFile(*dataRXY); - layer.surface = new Surface(_width, layer.coordinates->getHeight(), _bpp); - - _vm->_video->drawPackedSprite(fileCMP.c_str(), *layer.surface); + return new CMPFile(_vm, file, _width, 0, _bpp); } uint16 ANIFile::getAnimationCount() const { @@ -277,24 +249,13 @@ const ANIFile::Animation &ANIFile::getAnimationInfo(uint16 animation) const { return _animations[animation]; } -bool ANIFile::getPart(uint16 layer, uint16 part, - const Layer *&l, const RXYFile::Coordinates *&c) const { +bool ANIFile::getCoordinates(uint16 layer, uint16 part, + uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const { if (layer >= _layers.size()) return false; - l = &_layers[layer]; - if (!l->surface || !l->coordinates) - return false; - - if (part >= l->coordinates->size()) - return false; - - c = &(*l->coordinates)[part]; - if (c->left == 0xFFFF) - return false; - - return true; + return _layers[layer]->getCoordinates(part, left, top, right, bottom); } void ANIFile::draw(Surface &dest, uint16 animation, uint16 frame, int16 x, int16 y) const { @@ -314,13 +275,10 @@ void ANIFile::draw(Surface &dest, uint16 animation, uint16 frame, int16 x, int16 void ANIFile::drawLayer(Surface &dest, uint16 layer, uint16 part, int16 x, int16 y, int32 transp) const { - const Layer *l; - const RXYFile::Coordinates *c; - - if (!getPart(layer, part, l, c)) + if (layer >= _layers.size()) return; - dest.blit(*l->surface, c->left, c->top, c->right, c->bottom, x, y, transp); + _layers[layer]->draw(dest, part, x, y, transp); } } // End of namespace Gob diff --git a/engines/gob/anifile.h b/engines/gob/anifile.h index 1e10da6ff4..b6d9c735b5 100644 --- a/engines/gob/anifile.h +++ b/engines/gob/anifile.h @@ -28,8 +28,6 @@ #include "common/array.h" #include "common/list.h" -#include "gob/rxyfile.h" - namespace Common { class SeekableSubReadStreamEndian; } @@ -38,6 +36,7 @@ namespace Gob { class GobEngine; class Surface; +class CMPFile; /** An ANI file, describing an animation. * @@ -94,16 +93,7 @@ public: void draw(Surface &dest, uint16 animation, uint16 frame, int16 x, int16 y) const; private: - /** A sprite layer. */ - struct Layer { - Surface *surface; ///< The surface containing the layer sprite. - RXYFile *coordinates; ///< The coordinates describing the layer sprite parts. - - Layer(); - ~Layer(); - }; - - typedef Common::Array<Layer> LayerArray; + typedef Common::Array<CMPFile *> LayerArray; typedef Common::Array<Animation> AnimationArray; /** A "chunk" of an animation frame. */ @@ -139,9 +129,7 @@ private: void load(Common::SeekableSubReadStreamEndian &ani, const Common::String &fileName); - void loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &ani); - void loadLayer(Layer &layer, const Common::String &fileRXY, - const Common::String &fileCMP); + CMPFile *loadLayer(Common::SeekableSubReadStreamEndian &ani); void loadAnimation(Animation &animation, FrameArray &frames, Common::SeekableSubReadStreamEndian &ani); @@ -149,8 +137,8 @@ private: // Drawing helpers - bool getPart(uint16 layer, uint16 part, - const Layer *&l, const RXYFile::Coordinates *&c) const; + bool getCoordinates(uint16 layer, uint16 part, + uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const; void drawLayer(Surface &dest, uint16 layer, uint16 part, int16 x, int16 y, int32 transp) const; diff --git a/engines/gob/aniobject.cpp b/engines/gob/aniobject.cpp index 0ca850d1fb..154f8e04ed 100644 --- a/engines/gob/aniobject.cpp +++ b/engines/gob/aniobject.cpp @@ -22,11 +22,20 @@ #include "gob/surface.h" #include "gob/anifile.h" +#include "gob/cmpfile.h" #include "gob/aniobject.h" namespace Gob { -ANIObject::ANIObject(const ANIFile &ani) : _ani(&ani), +ANIObject::ANIObject(const ANIFile &ani) : _ani(&ani), _cmp(0), + _visible(false), _paused(false), _mode(kModeContinuous), + _x(0), _y(0), _background(0), _drawn(false) { + + setAnimation(0); + setPosition(); +} + +ANIObject::ANIObject(const CMPFile &cmp) : _ani(0), _cmp(&cmp), _visible(false), _paused(false), _mode(kModeContinuous), _x(0), _y(0), _background(0), _drawn(false) { @@ -68,6 +77,10 @@ void ANIObject::rewind() { } void ANIObject::setPosition() { + // CMP "animations" have no default position + if (_cmp) + return; + if (_animation >= _ani->getAnimationCount()) return; @@ -88,6 +101,12 @@ void ANIObject::getPosition(int16 &x, int16 &y) const { } void ANIObject::getFramePosition(int16 &x, int16 &y) const { + // CMP "animations" have no specific frame positions + if (_cmp) { + getPosition(x, y); + return; + } + if (_animation >= _ani->getAnimationCount()) return; @@ -100,6 +119,13 @@ void ANIObject::getFramePosition(int16 &x, int16 &y) const { } void ANIObject::getFrameSize(int16 &width, int16 &height) const { + if (_cmp) { + width = _cmp->getWidth (_animation); + height = _cmp->getHeight(_animation); + + return; + } + if (_animation >= _ani->getAnimationCount()) return; @@ -147,6 +173,47 @@ void ANIObject::draw(Surface &dest, int16 &left, int16 &top, if (!_visible) return; + if (_cmp) + drawCMP(dest, left, top, right, bottom); + else if (_ani) + drawANI(dest, left, top, right, bottom); +} + +void ANIObject::drawCMP(Surface &dest, int16 &left, int16 &top, + int16 &right, int16 &bottom) { + + if (!_background) { + uint16 width, height; + + _cmp->getMaxSize(width, height); + + _background = new Surface(width, height, dest.getBPP()); + } + + const uint16 cR = _cmp->getWidth (_animation) - 1; + const uint16 cB = _cmp->getHeight(_animation) - 1; + + _backgroundLeft = CLIP<int16>( + _x, 0, dest.getWidth () - 1); + _backgroundTop = CLIP<int16>( + _y, 0, dest.getHeight() - 1); + _backgroundRight = CLIP<int16>(cR + _x, 0, dest.getWidth () - 1); + _backgroundBottom = CLIP<int16>(cB + _y, 0, dest.getHeight() - 1); + + _background->blit(dest, _backgroundLeft , _backgroundTop, + _backgroundRight, _backgroundBottom, 0, 0); + + _cmp->draw(dest, _animation, _x, _y, 0); + + _drawn = true; + + left = _backgroundLeft; + top = _backgroundTop; + right = _backgroundRight; + bottom = _backgroundBottom; +} + +void ANIObject::drawANI(Surface &dest, int16 &left, int16 &top, + int16 &right, int16 &bottom) { + if (!_background) { uint16 width, height; @@ -202,6 +269,10 @@ void ANIObject::advance() { if (_paused) return; + // CMP "animations" have only one frame + if (_cmp) + return; + if (_animation >= _ani->getAnimationCount()) return; @@ -229,6 +300,10 @@ uint16 ANIObject::getFrame() const { } bool ANIObject::lastFrame() const { + // CMP "animations" have only one frame + if (_cmp) + return true; + if (_animation >= _ani->getAnimationCount()) return true; diff --git a/engines/gob/aniobject.h b/engines/gob/aniobject.h index e3fe301400..c101d747b7 100644 --- a/engines/gob/aniobject.h +++ b/engines/gob/aniobject.h @@ -28,6 +28,7 @@ namespace Gob { class ANIFile; +class CMPFile; class Surface; /** An ANI object, controlling an animation within an ANI file. */ @@ -38,7 +39,10 @@ public: kModeOnce ///< Play the animation only once. }; + /** Create an animation object from an ANI file. */ ANIObject(const ANIFile &ani); + /** Create an animation object from a CMP sprite. */ + ANIObject(const CMPFile &cmp); virtual ~ANIObject(); /** Make the object visible/invisible. */ @@ -98,6 +102,7 @@ public: private: const ANIFile *_ani; ///< The managed ANI file. + const CMPFile *_cmp; ///< The managed CMP file. uint16 _animation; ///< The current animation number uint16 _frame; ///< The current frame. @@ -117,6 +122,9 @@ private: int16 _backgroundTop; ///< The top of the saved background. int16 _backgroundRight; ///< The right position of the saved background. int16 _backgroundBottom; ///< The bottom position of the saved background. + + void drawCMP(Surface &dest, int16 &left, int16 &top, int16 &right, int16 &bottom); + void drawANI(Surface &dest, int16 &left, int16 &top, int16 &right, int16 &bottom); }; } // End of namespace Gob diff --git a/engines/gob/cmpfile.cpp b/engines/gob/cmpfile.cpp new file mode 100644 index 0000000000..7b21c4c835 --- /dev/null +++ b/engines/gob/cmpfile.cpp @@ -0,0 +1,246 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/stream.h" +#include "common/str.h" + +#include "gob/gob.h" +#include "gob/util.h" +#include "gob/surface.h" +#include "gob/video.h" +#include "gob/dataio.h" +#include "gob/rxyfile.h" +#include "gob/cmpfile.h" + +namespace Gob { + +CMPFile::CMPFile(GobEngine *vm, const Common::String &baseName, + uint16 width, uint16 height, uint8 bpp) : + _vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0), + _surface(0), _coordinates(0) { + + if (baseName.empty()) + return; + + const Common::String rxyFile = Util::setExtension(baseName, ".RXY"); + const Common::String cmpFile = Util::setExtension(baseName, ".CMP"); + + if (!_vm->_dataIO->hasFile(cmpFile)) + return; + + loadRXY(rxyFile); + createSurface(); + + loadCMP(cmpFile); +} + +CMPFile::CMPFile(GobEngine *vm, const Common::String &cmpFile, const Common::String &rxyFile, + uint16 width, uint16 height, uint8 bpp) : + _vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0), + _surface(0), _coordinates(0) { + + if (cmpFile.empty() || !_vm->_dataIO->hasFile(cmpFile)) + return; + + loadRXY(rxyFile); + createSurface(); + + loadCMP(cmpFile); +} + +CMPFile::CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp, Common::SeekableReadStream &rxy, + uint16 width, uint16 height, uint8 bpp) : + _vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0), + _surface(0), _coordinates(0) { + + loadRXY(rxy); + createSurface(); + + loadCMP(cmp); +} + +CMPFile::CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp, + uint16 width, uint16 height, uint8 bpp) : + _vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0), + _surface(0), _coordinates(0) { + + createRXY(); + createSurface(); + + loadCMP(cmp); +} + +CMPFile::~CMPFile() { + delete _surface; + delete _coordinates; +} + +bool CMPFile::empty() const { + return (_surface == 0) || (_coordinates == 0); +} + +uint16 CMPFile::getSpriteCount() const { + if (empty()) + return 0; + + return _coordinates->size(); +} + +void CMPFile::loadCMP(const Common::String &cmp) { + Common::SeekableReadStream *dataCMP = _vm->_dataIO->getFile(cmp); + if (!dataCMP) + return; + + loadCMP(*dataCMP); + + delete dataCMP; +} + +void CMPFile::loadRXY(const Common::String &rxy) { + Common::SeekableReadStream *dataRXY = 0; + if (!rxy.empty()) + dataRXY = _vm->_dataIO->getFile(rxy); + + if (dataRXY) + loadRXY(*dataRXY); + else + createRXY(); + + _height = _coordinates->getHeight(); + + delete dataRXY; +} + +void CMPFile::loadCMP(Common::SeekableReadStream &cmp) { + uint32 size = cmp.size(); + byte *data = new byte[size]; + + if (cmp.read(data, size) != size) + return; + + _vm->_video->drawPackedSprite(data, _surface->getWidth(), _surface->getHeight(), 0, 0, 0, *_surface); + + delete[] data; +} + +void CMPFile::loadRXY(Common::SeekableReadStream &rxy) { + _coordinates = new RXYFile(rxy); + + for (uint i = 0; i < _coordinates->size(); i++) { + const RXYFile::Coordinates &c = (*_coordinates)[i]; + + if (c.left == 0xFFFF) + continue; + + const uint16 width = c.right - c.left + 1; + const uint16 height = c.bottom - c.top + 1; + + _maxWidth = MAX(_maxWidth , width); + _maxHeight = MAX(_maxHeight, height); + } +} + +void CMPFile::createRXY() { + _coordinates = new RXYFile(_width, _height); + + _maxWidth = _width; + _maxHeight = _height; +} + +void CMPFile::createSurface() { + if (_width == 0) + _width = 320; + if (_height == 0) + _height = 200; + + _surface = new Surface(_width, _height, _bpp); +} + +bool CMPFile::getCoordinates(uint16 sprite, uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const { + if (empty() || (sprite >= _coordinates->size())) + return false; + + left = (*_coordinates)[sprite].left; + top = (*_coordinates)[sprite].top; + right = (*_coordinates)[sprite].right; + bottom = (*_coordinates)[sprite].bottom; + + return left != 0xFFFF; +} + +uint16 CMPFile::getWidth(uint16 sprite) const { + if (empty() || (sprite >= _coordinates->size())) + return 0; + + return (*_coordinates)[sprite].right - (*_coordinates)[sprite].left + 1; +} + +uint16 CMPFile::getHeight(uint16 sprite) const { + if (empty() || (sprite >= _coordinates->size())) + return 0; + + return (*_coordinates)[sprite].bottom - (*_coordinates)[sprite].top + 1; +} + +void CMPFile::getMaxSize(uint16 &width, uint16 &height) const { + width = _maxWidth; + height = _maxHeight; +} + +void CMPFile::draw(Surface &dest, uint16 sprite, uint16 x, uint16 y, int32 transp) const { + if (empty()) + return; + + if (sprite >= _coordinates->size()) + return; + + const RXYFile::Coordinates &coords = (*_coordinates)[sprite]; + + draw(dest, coords.left, coords.top, coords.right, coords.bottom, x, y, transp); +} + +void CMPFile::draw(Surface &dest, uint16 left, uint16 top, uint16 right, uint16 bottom, + uint16 x, uint16 y, int32 transp) const { + + if (!_surface) + return; + + if (left == 0xFFFF) + return; + + dest.blit(*_surface, left, top, right, bottom, x, y, transp); +} + +uint16 CMPFile::addSprite(uint16 left, uint16 top, uint16 right, uint16 bottom) { + if (empty()) + return 0; + + const uint16 height = bottom - top + 1; + const uint16 width = right - left + 1; + + _maxWidth = MAX(_maxWidth , width); + _maxHeight = MAX(_maxHeight, height); + + return _coordinates->add(left, top, right, bottom); +} + +} // End of namespace Gob diff --git a/engines/gob/cmpfile.h b/engines/gob/cmpfile.h new file mode 100644 index 0000000000..2b669e4d38 --- /dev/null +++ b/engines/gob/cmpfile.h @@ -0,0 +1,98 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef GOB_CMPFILE_H +#define GOB_CMPFILE_H + +#include "common/system.h" +#include "common/array.h" + +namespace Common { + class String; + class SeekableReadStream; +} + +namespace Gob { + +class GobEngine; +class Surface; +class RXYFile; + +/** A CMP file, containing a sprite. + * + * Used in hardcoded "actiony" parts of gob games. + */ +class CMPFile { +public: + CMPFile(GobEngine *vm, const Common::String &baseName, + uint16 width, uint16 height, uint8 bpp = 1); + CMPFile(GobEngine *vm, const Common::String &cmpFile, const Common::String &rxyFile, + uint16 width, uint16 height, uint8 bpp = 1); + CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp, Common::SeekableReadStream &rxy, + uint16 width, uint16 height, uint8 bpp = 1); + CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp, + uint16 width, uint16 height, uint8 bpp = 1); + ~CMPFile(); + + bool empty() const; + + uint16 getSpriteCount() const; + + bool getCoordinates(uint16 sprite, uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const; + + uint16 getWidth (uint16 sprite) const; + uint16 getHeight(uint16 sprite) const; + + void getMaxSize(uint16 &width, uint16 &height) const; + + void draw(Surface &dest, uint16 sprite, uint16 x, uint16 y, int32 transp = -1) const; + void draw(Surface &dest, uint16 left, uint16 top, uint16 right, uint16 bottom, + uint16 x, uint16 y, int32 transp = -1) const; + + uint16 addSprite(uint16 left, uint16 top, uint16 right, uint16 bottom); + +private: + GobEngine *_vm; + + uint16 _width; + uint16 _height; + uint16 _bpp; + + uint16 _maxWidth; + uint16 _maxHeight; + + Surface *_surface; + RXYFile *_coordinates; + + void loadCMP(const Common::String &cmp); + void loadRXY(const Common::String &rxy); + + void loadCMP(Common::SeekableReadStream &cmp); + void loadRXY(Common::SeekableReadStream &rxy); + + void createRXY(); + void createSurface(); +}; + +} // End of namespace Gob + +#endif // GOB_CMPFILE_H diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp index 1633a1edb7..2071c0f1be 100644 --- a/engines/gob/dataio.cpp +++ b/engines/gob/dataio.cpp @@ -414,7 +414,7 @@ Common::SeekableReadStream *DataIO::getFile(File &file) { return 0; Common::SeekableReadStream *rawData = - new Common::SafeSubReadStream(&file.archive->file, file.offset, file.offset + file.size); + new Common::SafeSeekableSubReadStream(&file.archive->file, file.offset, file.offset + file.size); if (file.compression == 0) return rawData; diff --git a/engines/gob/decfile.cpp b/engines/gob/decfile.cpp index f5910f0654..fb67c52627 100644 --- a/engines/gob/decfile.cpp +++ b/engines/gob/decfile.cpp @@ -29,25 +29,14 @@ #include "gob/dataio.h" #include "gob/surface.h" #include "gob/video.h" -#include "gob/rxyfile.h" +#include "gob/cmpfile.h" #include "gob/decfile.h" namespace Gob { -DECFile::Layer::Layer() : surface(0), coordinates(0) { -} - -DECFile::Layer::~Layer() { - delete coordinates; - delete surface; -} - - DECFile::DECFile(GobEngine *vm, const Common::String &fileName, uint16 width, uint16 height, uint8 bpp) : _vm(vm), - _width(width), _height(height), _bpp(bpp), _hasPadding(false) { - - _backdrop = new Surface(_width, _height, _bpp); + _width(width), _height(height), _bpp(bpp), _hasPadding(false), _backdrop(0) { Common::SeekableReadStream *dec = _vm->_dataIO->getFile(fileName); if (dec) { @@ -77,6 +66,9 @@ DECFile::DECFile(GobEngine *vm, const Common::String &fileName, DECFile::~DECFile() { delete _backdrop; + + for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l) + delete *l; } void DECFile::load(Common::SeekableSubReadStreamEndian &dec, const Common::String &fileName) { @@ -102,9 +94,9 @@ void DECFile::load(Common::SeekableSubReadStreamEndian &dec, const Common::Strin } // Load the layers - _layers.resize(MAX(0, layerCount - 1)); - for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l) - loadLayer(*l, dec); + _layers.reserve(MAX(0, layerCount - 1)); + for (int i = 0; i < layerCount - 1; i++) + _layers.push_back(loadLayer(dec)); // Load the backdrop parts if (backdropCount > 0) @@ -113,43 +105,19 @@ void DECFile::load(Common::SeekableSubReadStreamEndian &dec, const Common::Strin void DECFile::loadBackdrop(Common::SeekableSubReadStreamEndian &dec) { // Interestingly, DEC files reference "FOO.LBM" instead of "FOO.CMP" - Common::String file = Util::setExtension(Util::readString(dec, 13), ".CMP"); + Common::String file = Util::setExtension(Util::readString(dec, 13), ""); if (_hasPadding) dec.skip(1); - if (file.empty() || !_vm->_dataIO->hasFile(file)) - return; - - _vm->_video->drawPackedSprite(file.c_str(), *_backdrop); + _backdrop = new CMPFile(_vm, file, _width, _height, _bpp); } -void DECFile::loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &dec) { - Common::String file = Util::readString(dec, 13); +CMPFile *DECFile::loadLayer(Common::SeekableSubReadStreamEndian &dec) { + Common::String file = Util::setExtension(Util::readString(dec, 13), ""); if (_hasPadding) dec.skip(1); - if (file.empty()) - return; - - Common::String fileRXY = Util::setExtension(file, ".RXY"); - Common::String fileCMP = Util::setExtension(file, ".CMP"); - if (!_vm->_dataIO->hasFile(fileRXY) || !_vm->_dataIO->hasFile(fileCMP)) - return; - - loadLayer(layer, fileRXY, fileCMP); -} - -void DECFile::loadLayer(Layer &layer, const Common::String &fileRXY, - const Common::String &fileCMP) { - - Common::SeekableReadStream *dataRXY = _vm->_dataIO->getFile(fileRXY); - if (!dataRXY) - return; - - layer.coordinates = new RXYFile(*dataRXY); - layer.surface = new Surface(_width, layer.coordinates->getHeight(), _bpp); - - _vm->_video->drawPackedSprite(fileCMP.c_str(), *layer.surface); + return new CMPFile(_vm, file, _width, _height, _bpp); } void DECFile::loadParts(Common::SeekableSubReadStreamEndian &dec) { @@ -188,7 +156,10 @@ void DECFile::draw(Surface &dest) const { } void DECFile::drawBackdrop(Surface &dest) const { - dest.blit(*_backdrop); + if (!_backdrop) + return; + + _backdrop->draw(dest, 0, 0, 0); } void DECFile::drawLayer(Surface &dest, uint16 layer, uint16 part, @@ -197,18 +168,7 @@ void DECFile::drawLayer(Surface &dest, uint16 layer, uint16 part, if (layer >= _layers.size()) return; - const Layer &l = _layers[layer]; - if (!l.surface || !l.coordinates) - return; - - if (part >= l.coordinates->size()) - return; - - const RXYFile::Coordinates &c = (*l.coordinates)[part]; - if (c.left == 0xFFFF) - return; - - dest.blit(*l.surface, c.left, c.top, c.right, c.bottom, x, y, transp); + _layers[layer]->draw(dest, part, x, y, transp); } } // End of namespace Gob diff --git a/engines/gob/decfile.h b/engines/gob/decfile.h index 31d90180d3..48af740d41 100644 --- a/engines/gob/decfile.h +++ b/engines/gob/decfile.h @@ -34,7 +34,7 @@ namespace Gob { class GobEngine; class Surface; -class RXYFile; +class CMPFile; /** A DEC file, describing a "decal" (background). * @@ -60,14 +60,6 @@ public: uint16 x, uint16 y, int32 transp = -1) const; private: - struct Layer { - Surface *surface; ///< The surface containing the layer sprite. - RXYFile *coordinates; ///< The coordinates describing the layer sprite parts. - - Layer(); - ~Layer(); - }; - struct Part { uint8 layer; uint8 part; @@ -77,8 +69,8 @@ private: bool transp; }; - typedef Common::Array<Layer> LayerArray; - typedef Common::Array<Part> PartArray; + typedef Common::Array<CMPFile *> LayerArray; + typedef Common::Array<Part> PartArray; GobEngine *_vm; @@ -88,7 +80,7 @@ private: byte _hasPadding; - Surface *_backdrop; + CMPFile *_backdrop; LayerArray _layers; PartArray _parts; @@ -98,9 +90,7 @@ private: void loadBackdrop(Common::SeekableSubReadStreamEndian &dec); - void loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &dec); - void loadLayer(Layer &layer, const Common::String &fileRXY, - const Common::String &fileCMP); + CMPFile *loadLayer(Common::SeekableSubReadStreamEndian &dec); void loadParts(Common::SeekableSubReadStreamEndian &dec); void loadPart(Part &part, Common::SeekableSubReadStreamEndian &dec); diff --git a/engines/gob/detection_tables.h b/engines/gob/detection_tables.h index a88ddcc734..5c6e919e12 100644 --- a/engines/gob/detection_tables.h +++ b/engines/gob/detection_tables.h @@ -4057,6 +4057,24 @@ static const GOBGameDescription gameDescriptions[] = { kFeatures640x480, "intro2.stk", 0, 0 }, + { // Supplied by Hkz + { + "playtoons2", + "", + { + {"playtoon.stk", 0, "2572685400852d12759a2fbf09ec88eb", 9698780}, + {"spirou.stk", 0, "d3cfeff920b6343a2ece55088f530dba", 7076608}, + {0, 0, 0, 0} + }, + IT_ITA, + kPlatformPC, + ADGF_NO_FLAGS, + GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT) + }, + kGameTypePlaytoons, + kFeatures640x480, + "intro2.stk", 0, 0 + }, { // Supplied by scoriae in the forums { "playtoons2", diff --git a/engines/gob/module.mk b/engines/gob/module.mk index 1c83b4ae40..9da5a82de2 100644 --- a/engines/gob/module.mk +++ b/engines/gob/module.mk @@ -5,6 +5,7 @@ MODULE_OBJS := \ aniobject.o \ cheater.o \ cheater_geisha.o \ + cmpfile.o \ console.o \ dataio.o \ databases.o \ diff --git a/engines/gob/rxyfile.cpp b/engines/gob/rxyfile.cpp index 5311eece0f..9702dc8c7f 100644 --- a/engines/gob/rxyfile.cpp +++ b/engines/gob/rxyfile.cpp @@ -30,6 +30,15 @@ RXYFile::RXYFile(Common::SeekableReadStream &rxy) : _width(0), _height(0) { load(rxy); } +RXYFile::RXYFile(uint16 width, uint16 height) : _realCount(1), _width(width), _height(height) { + _coords.resize(1); + + _coords[0].left = 0; + _coords[0].top = 0; + _coords[0].right = _width - 1; + _coords[0].bottom = _height - 1; +} + RXYFile::~RXYFile() { } @@ -79,4 +88,15 @@ void RXYFile::load(Common::SeekableReadStream &rxy) { } } +uint16 RXYFile::add(uint16 left, uint16 top, uint16 right, uint16 bottom) { + _coords.resize(_coords.size() + 1); + + _coords.back().left = left; + _coords.back().top = top; + _coords.back().right = right; + _coords.back().bottom = bottom; + + return _coords.size() - 1; +} + } // End of namespace Gob diff --git a/engines/gob/rxyfile.h b/engines/gob/rxyfile.h index 828f8b73c7..bc9600b5b0 100644 --- a/engines/gob/rxyfile.h +++ b/engines/gob/rxyfile.h @@ -46,6 +46,7 @@ public: }; RXYFile(Common::SeekableReadStream &rxy); + RXYFile(uint16 width, uint16 height); ~RXYFile(); uint size() const; @@ -57,6 +58,8 @@ public: const Coordinates &operator[](uint i) const; + uint16 add(uint16 left, uint16 top, uint16 right, uint16 bottom); + private: typedef Common::Array<Coordinates> CoordArray; diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp index 1489e4f1f5..a63f123258 100644 --- a/engines/kyra/eobcommon.cpp +++ b/engines/kyra/eobcommon.cpp @@ -2066,7 +2066,7 @@ bool EoBCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int s = CLIP(s, 1, 20); - return s < m ? false : true; + return s >= m; } bool EoBCoreEngine::monsterAttackHitTest(EoBMonsterInPlay *m, int charIndex) { @@ -2300,7 +2300,7 @@ bool EoBCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int s -= constMod[c->constitutionCur]; } - return rollDice(1, 20) < s ? false : true; + return rollDice(1, 20) >= s; } bool EoBCoreEngine::specialAttackSavingThrow(int charIndex, int type) { diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp index e8e69d5b1f..e3c0743e5c 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui_eob.cpp @@ -1460,7 +1460,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data0Val1 == 4) { if (button->data1Callback) - (*button->data1Callback.get())(button); + (*button->data1Callback)(button); } } else if (button->data1Val1 == 2) { if (!(button->flags2 & 4)) @@ -1469,7 +1469,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data1Val1 == 4) { if (button->data1Callback) - (*button->data1Callback.get())(button); + (*button->data1Callback)(button); } } @@ -1486,7 +1486,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data0Val1 == 4) { if (button->data2Callback) - (*button->data2Callback.get())(button); + (*button->data2Callback)(button); } } else if (button->data2Val1 == 2) { _screen->drawBox(sx, sy, fx2, fy2, (button->flags2 & 1) ? button->data3Val2 : button->data2Val2); @@ -1494,7 +1494,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data2Val1 == 4) { if (button->data2Callback) - (*button->data2Callback.get())(button); + (*button->data2Callback)(button); } } @@ -1507,7 +1507,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data0Val1 == 4) { if (button->data0Callback) - (*button->data0Callback.get())(button); + (*button->data0Callback)(button); } else if (button->data0Val1 == 5) { _screen->drawBox(sx, sy, fx2, fy2, button->data0Val2); } else { @@ -1876,7 +1876,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 processButton(buttonList); if (v6 && buttonList->buttonCallback) - runLoop = ((*buttonList->buttonCallback.get())(buttonList)) ? false : true; + runLoop = !(*buttonList->buttonCallback)(buttonList); if ((flgs2 & 2) && (flgs & 0x20)) runLoop = false; @@ -2331,7 +2331,7 @@ bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) { _screen->setFont(of); _screen->setScreenDim(od); - return newHighlight ? false : true; + return newHighlight == 0; } void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) { @@ -3548,7 +3548,7 @@ bool GUI_EoB::confirmDialogue(int id) { _vm->removeInputTop(); if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) { - result = lastHighlight ? false : true; + result = lastHighlight == 0; inputFlag = 0x8021 + lastHighlight; runLoop = false; } else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) { diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index 18470e5d76..b4e5148b64 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -243,7 +243,7 @@ int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel) } if (mouseWheel && list->mouseWheel == mouseWheel && list->buttonCallback) { - if ((*list->buttonCallback.get())(list)) + if ((*list->buttonCallback)(list)) break; } @@ -282,7 +282,7 @@ int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel) if (processMouseClick) { if (list->buttonCallback) { - if ((*list->buttonCallback.get())(list)) + if ((*list->buttonCallback)(list)) break; } } @@ -349,7 +349,7 @@ void GUI_LoK::processButton(Button *button) { if (processType == 1 && shape) _screen->drawShape(_screen->_curPage, shape, x, y, button->dimTableIndex, 0x10); else if (processType == 4 && callback) - (*callback.get())(button); + (*callback)(button); } void GUI_LoK::setGUILabels() { diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index b025aefbd0..a79da0681e 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -2165,7 +2165,7 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW if (buttonList->buttonCallback) { //_vm->removeInputTop(); - if ((*buttonList->buttonCallback.get())(buttonList)) + if ((*buttonList->buttonCallback)(buttonList)) break; } diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui_rpg.cpp index a8b94032d0..be40050bb1 100644 --- a/engines/kyra/gui_rpg.cpp +++ b/engines/kyra/gui_rpg.cpp @@ -40,7 +40,8 @@ void KyraRpgEngine::removeInputTop() { } void KyraRpgEngine::gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor) { - w--; h--; + w--; + h--; if (fillColor != -1) screen()->fillRect(x + 1, y + 1, x + w - 1, y + h - 1, fillColor); @@ -128,6 +129,6 @@ bool KyraRpgEngine::clickedShape(int shapeIndex) { return false; } -} // End of namespace Kyra +} // End of namespace Kyra #endif // defined(ENABLE_EOB) || defined(ENABLE_LOL) diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index 580adb0e5d..65f8bd45e5 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -360,7 +360,7 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWh if (buttonList->buttonCallback) { _vm->removeInputTop(); - if ((*buttonList->buttonCallback.get())(buttonList)) + if ((*buttonList->buttonCallback)(buttonList)) break; } diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp index 8857f64f7e..f1d9550e8f 100644 --- a/engines/kyra/kyra_rpg.cpp +++ b/engines/kyra/kyra_rpg.cpp @@ -217,11 +217,11 @@ void KyraRpgEngine::drawDialogueButtons() { if (gameFlags().use16ColorMode) { gui_drawBox(x, ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1, 74, 10, 0xee, 0xcc, -1); screen()->printText(_dialogueButtonString[i], (x + 37 - (screen()->getTextWidth(_dialogueButtonString[i])) / 2) & ~3, - ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0); + ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0); } else { gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonWidth, guiSettings()->buttons.height, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill); screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonWidth >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2, - (_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelColor1 : _dialogueButtonLabelColor2, 0); + (_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelColor1 : _dialogueButtonLabelColor2, 0); } } screen()->setFont(of); @@ -255,11 +255,11 @@ uint16 KyraRpgEngine::processDialogue() { } if (snd_updateCharacterSpeech() != 2) { - res = 1; - if (!shouldQuit()) { - removeInputTop(); - gui_notifyButtonListChanged(); - } + res = 1; + if (!shouldQuit()) { + removeInputTop(); + gui_notifyButtonListChanged(); + } } } else { int e = checkInput(0, false, 0) & 0xFF; @@ -362,6 +362,6 @@ void KyraRpgEngine::updateEnvironmentalSfx(int soundId) { snd_processEnvironmentalSoundEffect(soundId, _currentBlock); } -} // End of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_EOB || ENABLE_LOL diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 11173a45c7..0033969047 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -119,7 +119,7 @@ struct GameFlags { bool useAltShapeHeader : 1; // alternative shape header (uses 2 bytes more, those are unused though) bool isTalkie : 1; bool isOldFloppy : 1; - bool useHiRes : 1; + bool useHiRes : 1; bool use16ColorMode : 1; bool useDigSound : 1; bool useInstallerPackage : 1; diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/saveload_rpg.cpp index f3eef0d811..d22c50dbeb 100644 --- a/engines/kyra/saveload_rpg.cpp +++ b/engines/kyra/saveload_rpg.cpp @@ -122,6 +122,6 @@ void KyraRpgEngine::releaseFlyingObjectTempData(LevelTempData *tmp) { delete[] p; } -} // End of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_EOB || ENABLE_LOL diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp index b015b10cd9..3a694e05fe 100644 --- a/engines/kyra/scene_rpg.cpp +++ b/engines/kyra/scene_rpg.cpp @@ -133,7 +133,7 @@ void KyraRpgEngine::generateBlockDrawingBuffer() { _sceneDrawVarLeft = _dscBlockMap[_currentDirection + 8]; /******************************************* - * _visibleBlocks map * + * _visibleBlocks map * * * * | | | | | | * * 00 | 01 | 02 | 03 | 04 | 05 | 06 * @@ -337,7 +337,7 @@ bool KyraRpgEngine::checkSceneUpdateNeed(int block) { } } - if (_currentBlock == block){ + if (_currentBlock == block) { _sceneUpdateRequired = true; return true; } @@ -626,7 +626,7 @@ void KyraRpgEngine::completeDoorOperations() { do { _levelBlockProperties[b].walls[_openDoorState[i].wall] += _openDoorState[i].state; _levelBlockProperties[b].walls[_openDoorState[i].wall ^ 2] += _openDoorState[i].state; - } while (!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30)); + } while (!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30)); _openDoorState[i].block = 0; } diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp index 9fae729bc4..e06ca42c40 100644 --- a/engines/kyra/screen_eob.cpp +++ b/engines/kyra/screen_eob.cpp @@ -147,7 +147,7 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ov uint8 *cursor = new uint8[mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]]; // We use memset and copyBlockToPage instead of fillRect to make sure that the // color key 0xFF doesn't get converted into EGA color - memset (cursor, colorKey, mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]); + memset(cursor, colorKey, mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]); copyBlockToPage(6, 0, 0, mouseW, mouseH, cursor); drawShape(6, shape, 0, 0, 0, 2, ovl); CursorMan.showMouse(false); diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp index dde22498eb..7d4b064e2a 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/screen_v2.cpp @@ -365,7 +365,7 @@ bool Screen_v2::calcBounds(int w0, int h0, int &x1, int &y1, int &w1, int &h1, i } } - return (w1 == -1) ? false : true; + return w1 != -1; } void Screen_v2::checkedPageUpdate(int srcPage, int dstPage) { diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp index 686c3c9320..f2abfb81dc 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -32,7 +32,7 @@ namespace Kyra { void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) { seq_init(); - bool allowSkip = (!(_flags.isDemo && !_flags.isTalkie) && (startSeq == kSequenceTitle)) ? false : true; + bool allowSkip = (_flags.isDemo && !_flags.isTalkie) || startSeq != kSequenceTitle; if (endSeq == -1) endSeq = startSeq; @@ -74,7 +74,7 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) { _seqFrameCounter = 0; _seqStartTime = _system->getMillis(); - allowSkip = (!(_flags.isDemo && !_flags.isTalkie) && (seqNum == kSequenceTitle)) ? false : true; + allowSkip = (_flags.isDemo && !_flags.isTalkie) || seqNum != kSequenceTitle; Sequence cseq = _sequences->seq[seqNum]; SeqProc cb = _callbackS[seqNum]; diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp index 5a05d81a22..a07abd4580 100644 --- a/engines/kyra/sprites_lol.cpp +++ b/engines/kyra/sprites_lol.cpp @@ -248,7 +248,7 @@ bool LoLEngine::updateMonsterAdjustBlocks(LoLMonster *monster) { int16 fx2 = 0; setLevelShapesDim(x2 + dims[y2], fx1, fx2, 13); - return (fx1 >= fx2) ? false : true; + return fx1 < fx2; } void LoLEngine::placeMonster(LoLMonster *monster, uint16 x, uint16 y) { @@ -1447,7 +1447,7 @@ void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) { uint16 mx = monster->x; uint16 my = monster->y; uint16 *c = (t & 1) ? &my : &mx; - bool centered = (*c & 0x7f) ? false : true; + bool centered = (*c & 0x7f) == 0; bool posFlag = true; if (monster->properties->maxWidth <= 63) { diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp index d0f7b5e532..52c14c7223 100644 --- a/engines/kyra/text_rpg.cpp +++ b/engines/kyra/text_rpg.cpp @@ -46,7 +46,7 @@ TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr) : _vm(e _textDimData = new TextDimData[_screen->screenDimTableCount()]; - for (int i = 0; i < _screen->screenDimTableCount(); i++){ + for (int i = 0; i < _screen->screenDimTableCount(); i++) { const ScreenDim *d = _screen->getScreenDim(i); _textDimData[i].color1 = d->unk8; _textDimData[i].color2 = d->unkA; @@ -188,11 +188,6 @@ void TextDisplayer_rpg::displayText(char *str, ...) { _textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv; break; - case 11: - _sjisLineBreakFlag=_sjisLineBreakFlag; - // TODO (UNUSED) - break; - case 12: if (isPc98) _sjisLineBreakFlag = true; @@ -203,29 +198,12 @@ void TextDisplayer_rpg::displayText(char *str, ...) { _textDimData[sdx].line++; break; - case 18: - _sjisLineBreakFlag=_sjisLineBreakFlag; - // TODO (UNUSED) - break; - - case 23: - _sjisLineBreakFlag=_sjisLineBreakFlag; - // TODO (UNUSED) - break; - - case 24: - _sjisLineBreakFlag=_sjisLineBreakFlag; - // TODO (UNUSED) - break; - - case 26: - _sjisLineBreakFlag=_sjisLineBreakFlag; - // TODO (UNUSED) - break; - - case 28: - _sjisLineBreakFlag=_sjisLineBreakFlag; - // TODO (UNUSED) + case 11: case 18: case 23: + case 24: case 26: case 28: + // These are at the time of writing this comment not known to be + // used. In case there is some use of them in some odd version + // we display this warning here. + warning("TextDisplayer_rpg::displayText: Triggered stub function %d", c - 1); break; default: @@ -286,14 +264,16 @@ void TextDisplayer_rpg::readNextPara() { // All necessary conversions take place somewhere else. This code actually causes issues if the character conversions // don't take place before calling displayText(). So we disable it for now. If some (not yet supported) localized // versions depend on this code we'll have to look at this again. - /* if ((_vm->game() != GI_LOL) && (d & 0x80)) { +#if 0 + if ((_vm->game() != GI_LOL) && (d & 0x80)) { d &= 0x7f; c = d & 7; d = (d & 0x78) >> 3; uint8 l = d; c = _table1[(l << 3) + c]; d = _table2[l]; - }*/ + } +#endif _ctrl[1] = d; _ctrl[2] = c; @@ -465,8 +445,8 @@ void TextDisplayer_rpg::printLine(char *str) { } void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakString) { - const char * str = (const char *)(_screen->getCPagePtr(5) + READ_LE_UINT16(&_screen->getCPagePtr(5)[(stringId - 1) << 1])); - assert (strlen(str) < kEoBTextBufferSize); + const char *str = (const char *)(_screen->getCPagePtr(5) + READ_LE_UINT16(&_screen->getCPagePtr(5)[(stringId - 1) << 1])); + assert(strlen(str) < kEoBTextBufferSize); Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize); displayText(_dialogueBuffer); @@ -481,7 +461,7 @@ void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakStr } void TextDisplayer_rpg::printDialogueText(const char *str, bool wait) { - assert (strlen(str) < kEoBTextBufferSize); + assert(strlen(str) < kEoBTextBufferSize); Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize); strcpy(_dialogueBuffer, str); diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp index de1becfa72..766fe453ab 100644 --- a/engines/kyra/timer_eob.cpp +++ b/engines/kyra/timer_eob.cpp @@ -186,7 +186,7 @@ void EoBCoreEngine::timerProcessFlyingObjects(int timerNum) { if (!fo->enable) continue; - bool endFlight = fo->distance ? false : true; + bool endFlight = fo->distance == 0; uint8 pos = dirPosIndex[(fo->direction << 2) + (fo->curPos & 3)]; uint16 bl = fo->curBlock; diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 04455ae307..471e83c9ed 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -395,7 +395,7 @@ void VQAMovie::displayFrame(uint frameNum) { if (frameNum >= _header.numFrames || !_opened) return; - bool foundSound = _stream ? false : true; + bool foundSound = !_stream; bool foundFrame = false; uint i; diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index 96e08ba808..4ef2dc50e8 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.cpp @@ -1805,7 +1805,7 @@ void Chapters::enterExitHelper(bool isEnteringStation) { getObjects()->update(kObjectHandleOutsideLeft, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand); getObjects()->update(kObjectHandleOutsideRight, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand); - getProgress().isTrainRunning = isEnteringStation ? false : true; + getProgress().isTrainRunning = !isEnteringStation; if (isEnteringStation) { ENTITY_PARAM(0, 2) = 1; diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp index ef4a22f73a..3fbbf84469 100644 --- a/engines/lure/debugger.cpp +++ b/engines/lure/debugger.cpp @@ -119,21 +119,21 @@ bool Debugger::cmd_listRooms(int argc, const char **argv) { DebugPrintf("Available rooms are:\n"); for (RoomDataList::iterator i = rooms.begin(); i != rooms.end(); ++i) { - RoomData *room = (*i).get(); + RoomData const &room = **i; // Explictly note the second drawbridge room as "Alt" - if (room->roomNumber == 49) { + if (room.roomNumber == 49) { strings.getString(47, buffer); strcat(buffer, " (alt)"); } else { - strings.getString(room->roomNumber, buffer); + strings.getString(room.roomNumber, buffer); } - DebugPrintf("#%d - %s", room->roomNumber, buffer); + DebugPrintf("#%d - %s", room.roomNumber, buffer); if (++ctr % 3 == 0) DebugPrintf("\n"); else { // Write out spaces between columns - int numSpaces = 25 - strlen(buffer) - ((room->roomNumber >= 10) ? 2 : 1); + int numSpaces = 25 - strlen(buffer) - (room.roomNumber >= 10 ? 2 : 1); char *s = buffer; while (numSpaces-- > 0) *s++ = ' '; *s = '\0'; @@ -243,13 +243,13 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) { // Loop for displaying active hotspots HotspotList::iterator i; for (i = res.activeHotspots().begin(); i != res.activeHotspots().end(); ++i) { - Hotspot *hotspot = (*i).get(); + Hotspot const &hotspot = **i; - if (hotspot->nameId() == 0) strcpy(buffer, "none"); - else strings.getString(hotspot->nameId(), buffer); + if (hotspot.nameId() == 0) strcpy(buffer, "none"); + else strings.getString(hotspot.nameId(), buffer); - DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot->hotspotId(), buffer, - hotspot->x(), hotspot->y(), hotspot->roomNumber()); + DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot.hotspotId(), buffer, + hotspot.x(), hotspot.y(), hotspot.roomNumber()); } } else { // Presume it's a room's hotspots @@ -257,14 +257,14 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) { HotspotDataList::iterator i; for (i = res.hotspotData().begin(); i != res.hotspotData().end(); ++i) { - HotspotData *hotspot = (*i).get(); + HotspotData const &hotspot = **i; - if (hotspot->roomNumber == roomNumber) { - if (hotspot->nameId == 0) strcpy(buffer, "none"); - else strings.getString(hotspot->nameId, buffer); + if (hotspot.roomNumber == roomNumber) { + if (hotspot.nameId == 0) strcpy(buffer, "none"); + else strings.getString(hotspot.nameId, buffer); - DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot->hotspotId, buffer, - hotspot->startX, hotspot->startY, hotspot->roomNumber); + DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot.hotspotId, buffer, + hotspot.startX, hotspot.startY, hotspot.roomNumber); } } } @@ -415,10 +415,10 @@ bool Debugger::cmd_room(int argc, const char **argv) { else { RoomExitHotspotList::iterator i; for (i = exits.begin(); i != exits.end(); ++i) { - RoomExitHotspotData *rec = (*i).get(); + RoomExitHotspotData const &rec = **i; DebugPrintf("\nArea - (%d,%d)-(%d,%d) Room=%d Cursor=%d Hotspot=%xh", - rec->xs, rec->ys, rec->xe, rec->ye, rec->destRoomNumber, rec->cursorNum, rec->hotspotId); + rec.xs, rec.ys, rec.xe, rec.ye, rec.destRoomNumber, rec.cursorNum, rec.hotspotId); } DebugPrintf("\n"); @@ -430,11 +430,11 @@ bool Debugger::cmd_room(int argc, const char **argv) { else { RoomExitList::iterator i2; for (i2 = room->exits.begin(); i2 != room->exits.end(); ++i2) { - RoomExitData *rec2 = (*i2).get(); + RoomExitData const &rec2 = **i2; DebugPrintf("\nExit - (%d,%d)-(%d,%d) Dest=%d,(%d,%d) Dir=%s Sequence=%xh", - rec2->xs, rec2->ys, rec2->xe, rec2->ye, rec2->roomNumber, - rec2->x, rec2->y, directionList[rec2->direction], rec2->sequenceOffset); + rec2.xs, rec2.ys, rec2.xe, rec2.ye, rec2.roomNumber, + rec2.x, rec2.y, directionList[rec2.direction], rec2.sequenceOffset); } DebugPrintf("\n"); diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index 9542c35785..eaed7ebbe7 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -71,12 +71,12 @@ void Game::tick() { uint16 *idList = new uint16[res.activeHotspots().size()]; int idSize = 0; for (i = res.activeHotspots().begin(); i != res.activeHotspots().end(); ++i) { - Hotspot *hotspot = (*i).get(); + Hotspot const &hotspot = **i; - if (!_preloadFlag || ((hotspot->layer() != 0xff) && - (hotspot->hotspotId() < FIRST_NONCHARACTER_ID))) + if (!_preloadFlag || ((hotspot.layer() != 0xff) && + (hotspot.hotspotId() < FIRST_NONCHARACTER_ID))) // Add hotspot to list to execute - idList[idSize++] = hotspot->hotspotId(); + idList[idSize++] = hotspot.hotspotId(); } debugC(ERROR_DETAILED, kLureDebugAnimations, "Hotspot ticks begin"); diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index c7e7e81900..ee7a185ea1 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -430,7 +430,7 @@ bool Hotspot::isActiveAnimation() { return ((_numFrames != 0) && (_layer != 0)); } -uint16 Hotspot::nameId() { +uint16 Hotspot::nameId() const { if (_data == NULL) return 0; else @@ -1169,30 +1169,30 @@ bool Hotspot::doorCloseCheck(uint16 doorId) { HotspotList::iterator i; HotspotList &lst = res.activeHotspots(); for (i = lst.begin(); i != lst.end(); ++i) { - Hotspot *hsCurrent = (*i).get(); + Hotspot const &hsCurrent = **i; // Skip entry if it's the door or the character - if ((hsCurrent->hotspotId() == hotspotId()) || - (hsCurrent->hotspotId() == doorHotspot->hotspotId())) + if ((hsCurrent.hotspotId() == hotspotId()) || + (hsCurrent.hotspotId() == doorHotspot->hotspotId())) continue; // Skip entry if it doesn't meet certain criteria - if ((hsCurrent->layer() == 0) || - (hsCurrent->roomNumber() != doorHotspot->roomNumber()) || - (hsCurrent->hotspotId() < PLAYER_ID) || - ((hsCurrent->hotspotId() >= 0x408) && (hsCurrent->hotspotId() < 0x2710))) + if ((hsCurrent.layer() == 0) || + (hsCurrent.roomNumber() != doorHotspot->roomNumber()) || + (hsCurrent.hotspotId() < PLAYER_ID) || + ((hsCurrent.hotspotId() >= 0x408) && (hsCurrent.hotspotId() < 0x2710))) continue; // Also skip entry if special Id - if ((hsCurrent->hotspotId() == 0xfffe) || (hsCurrent->hotspotId() == 0xffff)) + if ((hsCurrent.hotspotId() == 0xfffe) || (hsCurrent.hotspotId() == 0xffff)) continue; // Check to see if the character is intersecting the door area - int tempY = hsCurrent->y() + hsCurrent->heightCopy(); - if ((hsCurrent->x() >= bounds.right) || - (hsCurrent->x() + hsCurrent->widthCopy() <= bounds.left) || - (tempY + hsCurrent->charRectY() < bounds.top) || - (tempY - hsCurrent->yCorrection() - hsCurrent->charRectY() > bounds.bottom)) + int tempY = hsCurrent.y() + hsCurrent.heightCopy(); + if ((hsCurrent.x() >= bounds.right) || + (hsCurrent.x() + hsCurrent.widthCopy() <= bounds.left) || + (tempY + hsCurrent.charRectY() < bounds.top) || + (tempY - hsCurrent.yCorrection() - hsCurrent.charRectY() > bounds.bottom)) continue; // At this point we know a character is blocking door, so return false @@ -1883,12 +1883,12 @@ void Hotspot::doStatus(HotspotData *hotspot) { HotspotDataList &list = res.hotspotData(); HotspotDataList::iterator i; for (i = list.begin(); i != list.end(); ++i) { - HotspotData *rec = (*i).get(); + HotspotData const &rec = **i; - if (rec->roomNumber == PLAYER_ID) { + if (rec.roomNumber == PLAYER_ID) { if (numItems++ == 0) strcat(buffer, ": "); else strcat(buffer, ", "); - strings.getString(rec->nameId, buffer + strlen(buffer)); + strings.getString(rec.nameId, buffer + strlen(buffer)); } } @@ -2286,7 +2286,7 @@ void Hotspot::startTalk(HotspotData *charHotspot, uint16 id) { charHotspot->hotspotId, id); } -void Hotspot::saveToStream(Common::WriteStream *stream) { +void Hotspot::saveToStream(Common::WriteStream *stream) const { if (_data) _data->npcSchedule.saveToStream(stream); else @@ -4113,7 +4113,7 @@ void HotspotTickHandlers::npcRoomChange(Hotspot &h) { // This method performs rounding of the number of steps depending on direciton -int WalkingActionEntry::numSteps() { +int WalkingActionEntry::numSteps() const { switch (_direction) { case UP: case DOWN: @@ -4385,8 +4385,8 @@ Common::String PathFinder::getDebugInfo() const { WalkingActionList::const_iterator i; for (i = _list.begin(); i != _list.end(); ++i) { - WalkingActionEntry *e = (*i).get(); - buffer += Common::String::format("Direction=%d, numSteps=%d\n", e->direction(), e->numSteps()); + WalkingActionEntry const &e = **i; + buffer += Common::String::format("Direction=%d, numSteps=%d\n", e.direction(), e.numSteps()); } return buffer; @@ -4496,7 +4496,7 @@ void PathFinder::initVars() { _countdownCtr -= 700; } -void PathFinder::saveToStream(Common::WriteStream *stream) { +void PathFinder::saveToStream(Common::WriteStream *stream) const { stream->writeByte(_inUse); if (_inUse) { @@ -4504,11 +4504,10 @@ void PathFinder::saveToStream(Common::WriteStream *stream) { stream->write(_layer, sizeof(RoomPathsDecompressedData)); // Save any active step sequence - WalkingActionList::iterator i; - for (i = _list.begin(); i != _list.end(); ++i) { - WalkingActionEntry *entry = (*i).get(); - stream->writeByte(entry->direction()); - stream->writeSint16LE(entry->rawSteps()); + for (WalkingActionList::const_iterator i = _list.begin(); i != _list.end(); ++i) { + WalkingActionEntry &entry = **i; + stream->writeByte(entry.direction()); + stream->writeSint16LE(entry.rawSteps()); } stream->writeByte(0xff); stream->writeSint16LE(_stepCtr); @@ -4683,18 +4682,17 @@ bool Support::isCharacterInList(uint16 *lst, int numEntries, uint16 charId) { return false; } -void HotspotList::saveToStream(Common::WriteStream *stream) { - HotspotList::iterator i; - for (i = begin(); i != end(); ++i) { - Hotspot *hotspot = (*i).get(); - debugC(ERROR_INTERMEDIATE, kLureDebugAnimations, "Saving hotspot %xh", hotspot->hotspotId()); - bool dynamicObject = hotspot->hotspotId() != hotspot->originalId(); - stream->writeUint16LE(hotspot->originalId()); +void HotspotList::saveToStream(Common::WriteStream *stream) const { + for (HotspotList::const_iterator i = begin(); i != end(); ++i) { + Hotspot const &hotspot = **i; + debugC(ERROR_INTERMEDIATE, kLureDebugAnimations, "Saving hotspot %xh", hotspot.hotspotId()); + bool dynamicObject = hotspot.hotspotId() != hotspot.originalId(); + stream->writeUint16LE(hotspot.originalId()); stream->writeByte(dynamicObject); - stream->writeUint16LE(hotspot->destHotspotId()); - hotspot->saveToStream(stream); + stream->writeUint16LE(hotspot.destHotspotId()); + hotspot.saveToStream(stream); - debugC(ERROR_DETAILED, kLureDebugAnimations, "Saved hotspot %xh", hotspot->hotspotId()); + debugC(ERROR_DETAILED, kLureDebugAnimations, "Saved hotspot %xh", hotspot.hotspotId()); } stream->writeUint16LE(0); } diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h index a58a34456e..85d36dc138 100644 --- a/engines/lure/hotspots.h +++ b/engines/lure/hotspots.h @@ -111,9 +111,9 @@ private: int _numSteps; public: WalkingActionEntry(Direction dir, int steps): _direction(dir), _numSteps(steps) {} - Direction direction() { return _direction; } + Direction direction() const { return _direction; } int &rawSteps() { return _numSteps; } - int numSteps(); + int numSteps() const; }; enum PathFinderResult {PF_UNFINISHED, PF_OK, PF_DEST_OCCUPIED, PF_PART_PATH, PF_NO_WALK}; @@ -158,11 +158,11 @@ public: Common::String getDebugInfo() const; void pop() { _list.erase(_list.begin()); } - WalkingActionEntry &top() { return **_list.begin(); } - bool isEmpty() { return _list.empty(); } + WalkingActionEntry &top() const { return **_list.begin(); } + bool isEmpty() const { return _list.empty(); } int &stepCtr() { return _stepCtr; } - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -279,62 +279,62 @@ public: void setAnimation(uint16 newAnimId); void setAnimationIndex(int animIndex); void setAnimation(HotspotAnimData *newRecord); - uint16 hotspotId() { return _hotspotId; } - uint16 originalId() { return _originalId; } - Surface &frames() { return *_frames; } - HotspotAnimData &anim() { return *_anim; } - HotspotData *resource() { return _data; } - uint16 numFrames() { return _numFrames; } - uint16 frameNumber() { return _frameNumber; } + uint16 hotspotId() const { return _hotspotId; } + uint16 originalId() const { return _originalId; } + Surface &frames() const { return *_frames; } + HotspotAnimData &anim() const { return *_anim; } + HotspotData *resource() const { return _data; } + uint16 numFrames() const { return _numFrames; } + uint16 frameNumber() const { return _frameNumber; } void setFrameNumber(uint16 frameNum) { assert(frameNum < _numFrames); _frameNumber = frameNum; } void incFrameNumber(); - Direction direction() { return _direction; } - uint16 frameWidth() { return _width; } - int16 x() { return _startX; } - int16 y() { return _startY; } - int16 destX() { return _destX; } - int16 destY() { return _destY; } - int8 talkX() { return _talkX; } - int8 talkY() { return _talkY; } - uint16 destHotspotId() { return _destHotspotId; } - uint16 blockedOffset() { return _blockedOffset; } - uint8 exitCtr() { return _exitCtr; } - bool walkFlag() { return _walkFlag; } - uint16 startRoomNumber() { return _startRoomNumber; } - uint16 width() { return _width; } - uint16 height() { return _height; } - uint16 widthCopy() { return _widthCopy; } - uint16 heightCopy() { return _heightCopy; } - uint16 yCorrection() { return _yCorrection; } - uint16 charRectY() { return _charRectY; } - uint16 roomNumber() { return _roomNumber; } - uint16 talkScript() { + Direction direction() const { return _direction; } + uint16 frameWidth() const { return _width; } + int16 x() const { return _startX; } + int16 y() const { return _startY; } + int16 destX() const { return _destX; } + int16 destY() const { return _destY; } + int8 talkX() const { return _talkX; } + int8 talkY() const { return _talkY; } + uint16 destHotspotId() const { return _destHotspotId; } + uint16 blockedOffset() const { return _blockedOffset; } + uint8 exitCtr() const { return _exitCtr; } + bool walkFlag() const { return _walkFlag; } + uint16 startRoomNumber() const { return _startRoomNumber; } + uint16 width() const { return _width; } + uint16 height() const { return _height; } + uint16 widthCopy() const { return _widthCopy; } + uint16 heightCopy() const { return _heightCopy; } + uint16 yCorrection() const { return _yCorrection; } + uint16 charRectY() const { return _charRectY; } + uint16 roomNumber() const { return _roomNumber; } + uint16 talkScript() const { assert(_data); return _data->talkScriptOffset; } - uint16 hotspotScript() { return _hotspotScriptOffset; } - uint8 layer() { return _layer; } - bool skipFlag() { return _skipFlag; } + uint16 hotspotScript() const { return _hotspotScriptOffset; } + uint8 layer() const { return _layer; } + bool skipFlag() const { return _skipFlag; } void setTickProc(uint16 newVal); - bool persistant() { return _persistant; } + bool persistant() const { return _persistant; } void setPersistant(bool value) { _persistant = value; } - uint8 colorOffset() { return _colorOffset; } + uint8 colorOffset() const { return _colorOffset; } void setColorOffset(uint8 value) { _colorOffset = value; } void setRoomNumber(uint16 roomNum) { _roomNumber = roomNum; if (_data) _data->roomNumber = roomNum; } - uint16 nameId(); + uint16 nameId() const; const char *getName(); bool isActiveAnimation(); void setPosition(int16 newX, int16 newY); void setDestPosition(int16 newX, int16 newY) { _destX = newX; _destY = newY; } void setDestHotspot(uint16 id) { _destHotspotId = id; } void setExitCtr(uint8 value) { _exitCtr = value; } - BlockedState blockedState() { + BlockedState blockedState() const { assert(_data); return _data->blockedState; } @@ -342,7 +342,7 @@ public: assert(_data); _data->blockedState = newState; } - bool blockedFlag() { + bool blockedFlag() const { assert(_data); return _data->blockedFlag; } @@ -376,7 +376,7 @@ public: } void setCharRectY(uint16 value) { _charRectY = value; } void setSkipFlag(bool value) { _skipFlag = value; } - CharacterMode characterMode() { + CharacterMode characterMode() const { assert(_data != NULL); return _data->characterMode; } @@ -384,7 +384,7 @@ public: assert(_data != NULL); _data->characterMode = value; } - uint16 delayCtr() { + uint16 delayCtr() const { assert(_data); return _data->delayCtr; } @@ -392,7 +392,7 @@ public: assert(_data); _data->delayCtr = value; } - uint16 pauseCtr() { + uint16 pauseCtr() const { assert(_data); return _data->pauseCtr; } @@ -400,7 +400,7 @@ public: assert(_data); _data->pauseCtr = value; } - VariantBool coveredFlag() { + VariantBool coveredFlag() const { assert(_data); return _data->coveredFlag; } @@ -408,7 +408,7 @@ public: assert(_data); _data->coveredFlag = value; } - uint16 useHotspotId() { + uint16 useHotspotId() const { assert(_data); return _data->useHotspotId; } @@ -416,7 +416,7 @@ public: assert(_data); _data->useHotspotId = value; } - uint16 talkGate() { + uint16 talkGate() const { assert(_data); return _data->talkGate; } @@ -424,7 +424,7 @@ public: assert(_data); _data->talkGate = value; } - uint16 supportValue() { return _supportValue; } + uint16 supportValue() const { return _supportValue; } void setSupportValue(uint16 value) { _supportValue = value; } void copyTo(Surface *dest); @@ -449,16 +449,16 @@ public: void doAction(); void doAction(Action action, HotspotData *hotspot); - CurrentActionStack ¤tActions() { + CurrentActionStack ¤tActions() const { assert(_data); return _data->npcSchedule; } PathFinder &pathFinder() { return _pathFinder; } DestStructure &tempDest() { return _tempDest; } - uint16 frameCtr() { return _frameCtr; } + uint16 frameCtr() const { return _frameCtr; } void setFrameCtr(uint16 value) { _frameCtr = value; } void decrFrameCtr() { if (_frameCtr > 0) --_frameCtr; } - uint8 actionCtr() { + uint8 actionCtr() const { assert(_data); return _data->actionCtr; } @@ -466,7 +466,7 @@ public: assert(_data); _data->actionCtr = v; } - uint8 voiceCtr() { return _voiceCtr; } + uint8 voiceCtr() const { return _voiceCtr; } void setVoiceCtr(uint8 v) { _voiceCtr = v; } // Miscellaneous @@ -477,13 +477,13 @@ public: void scheduleConverse(uint16 destHotspot, uint16 messageId); void handleTalkDialog(); - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; class HotspotList: public Common::List<Common::SharedPtr<Hotspot> > { public: - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 61de2bf165..5a0dd26cba 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -276,11 +276,11 @@ uint16 PopupMenu::ShowInventory() { HotspotDataList::iterator i; for (i = rsc.hotspotData().begin(); i != rsc.hotspotData().end(); ++i) { - HotspotData *hotspot = (*i).get(); - if (hotspot->roomNumber == PLAYER_ID) { - idList[itemCtr] = hotspot->hotspotId; + HotspotData const &hotspot = **i; + if (hotspot.roomNumber == PLAYER_ID) { + idList[itemCtr] = hotspot.hotspotId; char *hotspotName = itemNames[itemCtr++] = (char *) malloc(MAX_HOTSPOT_NAME_SIZE); - strings.getString(hotspot->nameId, hotspotName); + strings.getString(hotspot.nameId, hotspotName); } } @@ -317,52 +317,52 @@ uint16 PopupMenu::ShowItems(Action contextAction, uint16 roomNumber) { // Loop for rooms for (ir = rooms.begin(); ir != rooms.end(); ++ir) { - RoomData *roomData = (*ir).get(); + RoomData const &roomData = **ir; // Pre-condition checks for whether to skip room - if ((roomData->hdrFlags != 15) && ((roomData->hdrFlags & fields.hdrFlagMask()) == 0)) + if ((roomData.hdrFlags != 15) && ((roomData.hdrFlags & fields.hdrFlagMask()) == 0)) continue; - if (((roomData->flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((roomData->flags & HOTSPOTFLAG_FOUND) == 0)) + if (((roomData.flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((roomData.flags & HOTSPOTFLAG_FOUND) == 0)) continue; - if ((roomData->actions & contextBitflag) == 0) + if ((roomData.actions & contextBitflag) == 0) continue; // Add room to list of entries to display if (numItems == MAX_NUM_DISPLAY_ITEMS) error("Out of space in ask list"); - entryIds[numItems] = roomData->roomNumber; - nameIds[numItems] = roomData->roomNumber; + entryIds[numItems] = roomData.roomNumber; + nameIds[numItems] = roomData.roomNumber; entryNames[numItems] = (char *) Memory::alloc(MAX_HOTSPOT_NAME_SIZE); - strings.getString(roomData->roomNumber, entryNames[numItems]); + strings.getString(roomData.roomNumber, entryNames[numItems]); ++numItems; } // Loop for hotspots for (ih = hotspots.begin(); ih != hotspots.end(); ++ih) { - HotspotData *hotspot = (*ih).get(); + HotspotData const &hotspot = **ih; - if ((hotspot->headerFlags != 15) && - ((hotspot->headerFlags & fields.hdrFlagMask()) == 0)) + if ((hotspot.headerFlags != 15) && + ((hotspot.headerFlags & fields.hdrFlagMask()) == 0)) continue; - if (((hotspot->flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((hotspot->flags & HOTSPOTFLAG_FOUND) == 0)) + if (((hotspot.flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((hotspot.flags & HOTSPOTFLAG_FOUND) == 0)) // Skip the current hotspot continue; // If the hotspot is room specific, skip if the character will not be in the specified room - if (((hotspot->flags & HOTSPOTFLAG_ROOM_SPECIFIC) != 0) && - (hotspot->roomNumber != roomNumber)) + if (((hotspot.flags & HOTSPOTFLAG_ROOM_SPECIFIC) != 0) && + (hotspot.roomNumber != roomNumber)) continue; // If hotspot does not allow action, then skip it - if ((hotspot->actions & contextBitflag) == 0) + if ((hotspot.actions & contextBitflag) == 0) continue; // If a special hotspot Id, then skip displaying - if ((hotspot->nameId == 0x17A) || (hotspot->nameId == 0x147)) + if ((hotspot.nameId == 0x17A) || (hotspot.nameId == 0x147)) continue; // Check if the hotspot's name is already used in an already set item itemCtr = 0; - while ((itemCtr < numItems) && (nameIds[itemCtr] != hotspot->nameId)) + while ((itemCtr < numItems) && (nameIds[itemCtr] != hotspot.nameId)) ++itemCtr; if (itemCtr != numItems) // Item's name is already present - skip hotspot @@ -370,10 +370,10 @@ uint16 PopupMenu::ShowItems(Action contextAction, uint16 roomNumber) { // Add hotspot to list of entries to display if (numItems == MAX_NUM_DISPLAY_ITEMS) error("Out of space in ask list"); - entryIds[numItems] = hotspot->hotspotId; - nameIds[numItems] = hotspot->nameId; + entryIds[numItems] = hotspot.hotspotId; + nameIds[numItems] = hotspot.nameId; entryNames[numItems] = (char *) Memory::alloc(MAX_HOTSPOT_NAME_SIZE); - strings.getString(hotspot->nameId, entryNames[numItems]); + strings.getString(hotspot.nameId, entryNames[numItems]); ++numItems; } diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index 6328301233..9ec641140b 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -386,7 +386,6 @@ RoomData *Resources::getRoom(uint16 roomNumber) { for (i = _roomData.begin(); i != _roomData.end(); ++i) { RoomData *rec = (*i).get(); if (rec->roomNumber == roomNumber) return rec; - ++rec; } return NULL; @@ -678,9 +677,9 @@ void Resources::deactivateHotspot(uint16 hotspotId, bool isDestId) { HotspotList::iterator i = _activeHotspots.begin(); while (i != _activeHotspots.end()) { - Hotspot *h = (*i).get(); - if ((!isDestId && (h->hotspotId() == hotspotId)) || - (isDestId && (h->destHotspotId() == hotspotId) && (h->hotspotId() == 0xffff))) { + Hotspot const &h = **i; + if ((!isDestId && (h.hotspotId() == hotspotId)) || + (isDestId && (h.destHotspotId() == hotspotId) && (h.hotspotId() == 0xffff))) { _activeHotspots.erase(i); break; } @@ -708,8 +707,7 @@ uint16 Resources::numInventoryItems() { HotspotDataList &list = _hotspotData; HotspotDataList::iterator i; for (i = list.begin(); i != list.end(); ++i) { - HotspotData *rec = (*i).get(); - if (rec->roomNumber == PLAYER_ID) ++numItems; + if ((*i)->roomNumber == PLAYER_ID) ++numItems; } return numItems; @@ -754,12 +752,12 @@ void Resources::saveToStream(Common::WriteStream *stream) { // Save out the schedule for any non-active NPCs HotspotDataList::iterator i; for (i = _hotspotData.begin(); i != _hotspotData.end(); ++i) { - HotspotData *rec = (*i).get(); - if (!rec->npcSchedule.isEmpty()) { - Hotspot *h = getActiveHotspot(rec->hotspotId); + HotspotData const &rec = **i; + if (!rec.npcSchedule.isEmpty()) { + Hotspot *h = getActiveHotspot(rec.hotspotId); if (h == NULL) { - stream->writeUint16LE(rec->hotspotId); - rec->npcSchedule.saveToStream(stream); + stream->writeUint16LE(rec.hotspotId); + rec.npcSchedule.saveToStream(stream); } } } diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index 222f55b5dc..aee4f11215 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -278,13 +278,11 @@ void RoomPathsData::decompress(RoomPathsDecompressedData &dataOut, int character // Room data class -void RoomDataList::saveToStream(Common::WriteStream *stream) { - RoomDataList::iterator i; - - for (i = begin(); i != end(); ++i) { - RoomData *rec = (*i).get(); - stream->writeByte(rec->flags); - const byte *pathData = rec->paths.data(); +void RoomDataList::saveToStream(Common::WriteStream *stream) const { + for (RoomDataList::const_iterator i = begin(); i != end(); ++i) { + RoomData const &rec = **i; + stream->writeByte(rec.flags); + const byte *pathData = rec.paths.data(); stream->write(pathData, ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH); } } @@ -294,10 +292,10 @@ void RoomDataList::loadFromStream(Common::ReadStream *stream) { byte data[ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH]; for (i = begin(); i != end(); ++i) { - RoomData *rec = (*i).get(); - rec->flags = stream->readByte(); + RoomData &rec = **i; + rec.flags = stream->readByte(); stream->read(data, ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH); - rec->paths.load(data); + rec.paths.load(data); } } @@ -317,17 +315,17 @@ RoomExitJoinData::RoomExitJoinData(RoomExitJoinResource *rec) { blocked = rec->blocked; } -void RoomExitJoinList::saveToStream(Common::WriteStream *stream) { - for (RoomExitJoinList::iterator i = begin(); i != end(); ++i) { - RoomExitJoinData *rec = (*i).get(); - - stream->writeUint16LE(rec->hotspots[0].hotspotId); - stream->writeUint16LE(rec->hotspots[1].hotspotId); - stream->writeByte(rec->hotspots[0].currentFrame); - stream->writeByte(rec->hotspots[0].destFrame); - stream->writeByte(rec->hotspots[1].currentFrame); - stream->writeByte(rec->hotspots[1].destFrame); - stream->writeByte(rec->blocked); +void RoomExitJoinList::saveToStream(Common::WriteStream *stream) const { + for (RoomExitJoinList::const_iterator i = begin(); i != end(); ++i) { + RoomExitJoinData const &rec = **i; + + stream->writeUint16LE(rec.hotspots[0].hotspotId); + stream->writeUint16LE(rec.hotspots[1].hotspotId); + stream->writeByte(rec.hotspots[0].currentFrame); + stream->writeByte(rec.hotspots[0].destFrame); + stream->writeByte(rec.hotspots[1].currentFrame); + stream->writeByte(rec.hotspots[1].destFrame); + stream->writeByte(rec.blocked); } // Write end of list marker @@ -336,21 +334,21 @@ void RoomExitJoinList::saveToStream(Common::WriteStream *stream) { void RoomExitJoinList::loadFromStream(Common::ReadStream *stream) { for (RoomExitJoinList::iterator i = begin(); i != end(); ++i) { - RoomExitJoinData *rec = (*i).get(); + RoomExitJoinData &rec = **i; uint16 hotspot1Id = stream->readUint16LE(); if (hotspot1Id == 0xffff) error("Invalid room exit join list"); uint16 hotspot2Id = stream->readUint16LE(); - if ((rec->hotspots[0].hotspotId != hotspot1Id) || - (rec->hotspots[1].hotspotId != hotspot2Id)) + if ((rec.hotspots[0].hotspotId != hotspot1Id) || + (rec.hotspots[1].hotspotId != hotspot2Id)) break; - rec->hotspots[0].currentFrame = stream->readByte(); - rec->hotspots[0].destFrame = stream->readByte(); - rec->hotspots[1].currentFrame = stream->readByte(); - rec->hotspots[1].destFrame = stream->readByte(); - rec->blocked = stream->readByte(); + rec.hotspots[0].currentFrame = stream->readByte(); + rec.hotspots[0].destFrame = stream->readByte(); + rec.hotspots[1].currentFrame = stream->readByte(); + rec.hotspots[1].destFrame = stream->readByte(); + rec.blocked = stream->readByte(); } // Read final end of list marker @@ -368,8 +366,8 @@ HotspotActionData::HotspotActionData(HotspotActionResource *rec) { uint16 HotspotActionList::getActionOffset(Action action) { iterator i; for (i = begin(); i != end(); ++i) { - HotspotActionData *rec = (*i).get(); - if (rec->action == action) return rec->sequenceOffset; + HotspotActionData const &rec = **i; + if (rec.action == action) return rec.sequenceOffset; } return 0; @@ -435,7 +433,7 @@ HotspotData::HotspotData(HotspotResource *rec) { npcScheduleId = READ_LE_UINT16(&rec->npcSchedule); } -void HotspotData::saveToStream(Common::WriteStream *stream) { +void HotspotData::saveToStream(Common::WriteStream *stream) const { // Write out the basic fields stream->writeUint16LE(nameId); stream->writeUint16LE(descId); @@ -534,12 +532,11 @@ void HotspotData::loadFromStream(Common::ReadStream *stream) { // Hotspot data list -void HotspotDataList::saveToStream(Common::WriteStream *stream) { - iterator i; - for (i = begin(); i != end(); ++i) { - HotspotData *hotspot = (*i).get(); - stream->writeUint16LE(hotspot->hotspotId); - hotspot->saveToStream(stream); +void HotspotDataList::saveToStream(Common::WriteStream *stream) const { + for (const_iterator i = begin(); i != end(); ++i) { + HotspotData const &hotspot = **i; + stream->writeUint16LE(hotspot.hotspotId); + hotspot.saveToStream(stream); } stream->writeUint16LE(0); } @@ -582,14 +579,14 @@ bool MovementDataList::getFrame(uint16 currentFrame, int16 &xChange, iterator i; for (i = begin(); i != end(); ++i) { - MovementData *rec = (*i).get(); + MovementData const &rec = **i; if (foundFlag || (i == begin())) { - xChange = rec->xChange; - yChange = rec->yChange; - nextFrame = rec->frameNumber; + xChange = rec.xChange; + yChange = rec.yChange; + nextFrame = rec.frameNumber; if (foundFlag) return true; } - if (rec->frameNumber == currentFrame) foundFlag = true; + if (rec.frameNumber == currentFrame) foundFlag = true; } return true; @@ -699,15 +696,12 @@ TalkEntryData *TalkData::getResponse(int index) { // The following class acts as a container for all the NPC conversations -void TalkDataList::saveToStream(Common::WriteStream *stream) { - TalkDataList::iterator i; - for (i = begin(); i != end(); ++i) { - TalkData *rec = (*i).get(); - TalkEntryList::iterator i2; +void TalkDataList::saveToStream(Common::WriteStream *stream) const { + for (TalkDataList::const_iterator i = begin(); i != end(); ++i) { + TalkData const &rec = **i; - for (i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) { - TalkEntryData *entry = (*i2).get(); - stream->writeUint16LE(entry->descId); + for (TalkEntryList::const_iterator i2 = rec.entries.begin(); i2 != rec.entries.end(); ++i2) { + stream->writeUint16LE((*i2)->descId); } } } @@ -715,12 +709,10 @@ void TalkDataList::saveToStream(Common::WriteStream *stream) { void TalkDataList::loadFromStream(Common::ReadStream *stream) { TalkDataList::iterator i; for (i = begin(); i != end(); ++i) { - TalkData *rec = (*i).get(); - TalkEntryList::iterator i2; + TalkData const &rec = **i; - for (i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) { - TalkEntryData *entry = (*i2).get(); - entry->descId = stream->readUint16LE(); + for (TalkEntryList::const_iterator i2 = rec.entries.begin(); i2 != rec.entries.end(); ++i2) { + (*i2)->descId = stream->readUint16LE(); } } } @@ -785,17 +777,17 @@ void SequenceDelayList::tick() { g_system->getMillis()); for (i = begin(); i != end(); ++i) { - SequenceDelayData *entry = (*i).get(); - debugC(ERROR_DETAILED, kLureDebugScripts, "Delay List check %xh at time %d", entry->sequenceOffset, entry->timeoutCtr); + SequenceDelayData &entry = **i; + debugC(ERROR_DETAILED, kLureDebugScripts, "Delay List check %xh at time %d", entry.sequenceOffset, entry.timeoutCtr); - if (entry->timeoutCtr <= GAME_FRAME_DELAY) { + if (entry.timeoutCtr <= GAME_FRAME_DELAY) { // Timeout reached - delete entry from list and execute the sequence - uint16 seqOffset = entry->sequenceOffset; + uint16 seqOffset = entry.sequenceOffset; erase(i); Script::execute(seqOffset); return; } else { - entry->timeoutCtr -= GAME_FRAME_DELAY; + entry.timeoutCtr -= GAME_FRAME_DELAY; } } } @@ -804,22 +796,19 @@ void SequenceDelayList::clear(bool forceClear) { SequenceDelayList::iterator i = begin(); while (i != end()) { - SequenceDelayData *entry = (*i).get(); - if (entry->canClear || forceClear) + if ((*i)->canClear || forceClear) i = erase(i); else ++i; } } -void SequenceDelayList::saveToStream(Common::WriteStream *stream) { - SequenceDelayList::iterator i; - - for (i = begin(); i != end(); ++i) { - SequenceDelayData *entry = (*i).get(); - stream->writeUint16LE(entry->sequenceOffset); - stream->writeUint32LE(entry->timeoutCtr); - stream->writeByte(entry->canClear); +void SequenceDelayList::saveToStream(Common::WriteStream *stream) const { + for (SequenceDelayList::const_iterator i = begin(); i != end(); ++i) { + SequenceDelayData const &entry = **i; + stream->writeUint16LE(entry.sequenceOffset); + stream->writeUint32LE(entry.timeoutCtr); + stream->writeByte(entry.canClear); } stream->writeUint16LE(0); @@ -1016,7 +1005,7 @@ RandomActionSet *RandomActionList::getRoom(uint16 roomNumber) { return NULL; } -void RandomActionSet::saveToStream(Common::WriteStream *stream) { +void RandomActionSet::saveToStream(Common::WriteStream *stream) const { stream->writeByte(numActions()); for (int actionIndex = 0; actionIndex < _numActions; ++actionIndex) stream->writeByte((byte)_types[actionIndex]); @@ -1030,8 +1019,8 @@ void RandomActionSet::loadFromStream(Common::ReadStream *stream) { } -void RandomActionList::saveToStream(Common::WriteStream *stream) { - for (iterator i = begin(); i != end(); ++i) +void RandomActionList::saveToStream(Common::WriteStream *stream) const { + for (const_iterator i = begin(); i != end(); ++i) (*i)->saveToStream(stream); } @@ -1052,9 +1041,9 @@ RoomExitIndexedHotspotData::RoomExitIndexedHotspotData(RoomExitIndexedHotspotRes uint16 RoomExitIndexedHotspotList::getHotspot(uint16 roomNumber, uint8 hotspotIndexId) { iterator i; for (i = begin(); i != end(); ++i) { - RoomExitIndexedHotspotData *entry = (*i).get(); - if ((entry->roomNumber == roomNumber) && (entry->hotspotIndex == hotspotIndexId)) - return entry->hotspotId; + RoomExitIndexedHotspotData const &entry = **i; + if ((entry.roomNumber == roomNumber) && (entry.hotspotIndex == hotspotIndexId)) + return entry.hotspotId; } // No hotspot @@ -1074,12 +1063,12 @@ PausedCharacter::PausedCharacter(uint16 SrcCharId, uint16 DestCharId) { void PausedCharacterList::reset(uint16 hotspotId) { iterator i; for (i = begin(); i != end(); ++i) { - PausedCharacter *rec = (*i).get(); + PausedCharacter &rec = **i; - if (rec->srcCharId == hotspotId) { - rec->counter = 1; - if (rec->destCharId < START_EXIT_ID) - rec->charHotspot->pauseCtr = 1; + if (rec.srcCharId == hotspotId) { + rec.counter = 1; + if (rec.destCharId < START_EXIT_ID) + rec.charHotspot->pauseCtr = 1; } } } @@ -1088,15 +1077,15 @@ void PausedCharacterList::countdown() { iterator i = begin(); while (i != end()) { - PausedCharacter *rec = (*i).get(); - --rec->counter; + PausedCharacter &rec = **i; + --rec.counter; // Handle reflecting counter to hotspot - if (rec->destCharId < START_EXIT_ID) - rec->charHotspot->pauseCtr = rec->counter + 1; + if (rec.destCharId < START_EXIT_ID) + rec.charHotspot->pauseCtr = rec.counter + 1; // If counter has reached zero, remove entry from list - if (rec->counter == 0) + if (rec.counter == 0) i = erase(i); else ++i; @@ -1109,13 +1098,13 @@ void PausedCharacterList::scan(Hotspot &h) { if (h.blockedState() != BS_NONE) { for (i = begin(); i != end(); ++i) { - PausedCharacter *rec = (*i).get(); + PausedCharacter &rec = **i; - if (rec->srcCharId == h.hotspotId()) { - rec->counter = IDLE_COUNTDOWN_SIZE; + if (rec.srcCharId == h.hotspotId()) { + rec.counter = IDLE_COUNTDOWN_SIZE; - if (rec->destCharId < START_EXIT_ID) - rec->charHotspot->pauseCtr = IDLE_COUNTDOWN_SIZE; + if (rec.destCharId < START_EXIT_ID) + rec.charHotspot->pauseCtr = IDLE_COUNTDOWN_SIZE; } } } @@ -1139,9 +1128,9 @@ int PausedCharacterList::check(uint16 charId, int numImpinging, uint16 *impingin // calling character and the impinging list entry bool foundEntry = false; for (i = res.pausedList().begin(); !foundEntry && (i != res.pausedList().end()); ++i) { - PausedCharacter *rec = (*i).get(); - foundEntry = (rec->srcCharId == charId) && - (rec->destCharId == hotspot->hotspotId()); + PausedCharacter const &rec = **i; + foundEntry = (rec.srcCharId == charId) && + (rec.destCharId == hotspot->hotspotId()); } if (foundEntry) @@ -1196,7 +1185,7 @@ BarEntry &BarmanLists::getDetails(uint16 roomNumber) { error("Invalid room %d specified for barman details retrieval", roomNumber); } -void BarmanLists::saveToStream(Common::WriteStream *stream) { +void BarmanLists::saveToStream(Common::WriteStream *stream) const { for (int index = 0; index < 3; ++index) { uint16 value = (_barList[index].currentCustomer == NULL) ? 0 : (_barList[index].currentCustomer - &_barList[index].customers[0]) / sizeof(BarEntry) + 1; @@ -1296,7 +1285,7 @@ void ValueTableData::setField(FieldName fieldName, uint16 value) { setField((uint16) fieldName, value); } -void ValueTableData::saveToStream(Common::WriteStream *stream) { +void ValueTableData::saveToStream(Common::WriteStream *stream) const { // Write out the special fields stream->writeUint16LE(_numGroats); stream->writeSint16LE(_playerNewPos.position.x); @@ -1371,7 +1360,7 @@ void CurrentActionEntry::setSupportData(uint16 entryId) { setSupportData(newEntry); } -void CurrentActionEntry::saveToStream(Common::WriteStream *stream) { +void CurrentActionEntry::saveToStream(Common::WriteStream *stream) const { debugC(ERROR_DETAILED, kLureDebugAnimations, "Saving hotspot action entry dyn=%d id=%d", hasSupportData(), hasSupportData() ? supportData().id() : 0); stream->writeByte((uint8) _action); @@ -1443,11 +1432,11 @@ Common::String CurrentActionStack::getDebugInfo() const { buffer += Common::String::format("CurrentActionStack::list num_actions=%d\n", size()); for (i = _actions.begin(); i != _actions.end(); ++i) { - CurrentActionEntry *entry = (*i).get(); - buffer += Common::String::format("style=%d room#=%d", entry->action(), entry->roomNumber()); + CurrentActionEntry const &entry = **i; + buffer += Common::String::format("style=%d room#=%d", entry.action(), entry.roomNumber()); - if (entry->hasSupportData()) { - CharacterScheduleEntry &rec = entry->supportData(); + if (entry.hasSupportData()) { + CharacterScheduleEntry &rec = entry.supportData(); buffer += Common::String::format(", action=%d params=", rec.action()); @@ -1466,16 +1455,13 @@ Common::String CurrentActionStack::getDebugInfo() const { return buffer; } -void CurrentActionStack::saveToStream(Common::WriteStream *stream) { - ActionsList::iterator i; - +void CurrentActionStack::saveToStream(Common::WriteStream *stream) const { debugC(ERROR_DETAILED, kLureDebugAnimations, "Saving hotspot action stack"); Common::String buffer = getDebugInfo(); debugC(ERROR_DETAILED, kLureDebugAnimations, "%s", buffer.c_str()); - for (i = _actions.begin(); i != _actions.end(); ++i) { - CurrentActionEntry *rec = (*i).get(); - rec->saveToStream(stream); + for (ActionsList::const_iterator i = _actions.begin(); i != _actions.end(); ++i) { + (*i)->saveToStream(stream); } stream->writeByte(0xff); // End of list marker debugC(ERROR_DETAILED, kLureDebugAnimations, "Finished saving hotspot action stack"); diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index 8d6c557297..a4d2f76cec 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -300,7 +300,7 @@ public: void load(byte *srcData) { memcpy(_data, srcData, ROOM_PATHS_SIZE); } - const byte *data() { return _data; } + const byte *data() const { return _data; } bool isOccupied(int x, int y); bool isOccupied(int x, int y, int width); void setOccupied(int x, int y, int width); @@ -334,7 +334,7 @@ public: class RoomDataList: public Common::List<Common::SharedPtr<RoomData> > { public: - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -357,7 +357,7 @@ public: class RoomExitJoinList: public Common::List<Common::SharedPtr<RoomExitJoinData> > { public: - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -433,13 +433,13 @@ public: if (_dynamicSupportData) delete _supportData; } - CurrentAction action() { return _action; } - CharacterScheduleEntry &supportData() { + CurrentAction action() const { return _action; } + CharacterScheduleEntry &supportData() const { if (!_supportData) error("Access made to non-defined action support record"); return *_supportData; } - bool hasSupportData() { return _supportData != NULL; } - uint16 roomNumber() { return _roomNumber; } + bool hasSupportData() const { return _supportData != NULL; } + uint16 roomNumber() const { return _roomNumber; } void setAction(CurrentAction newAction) { _action = newAction; } void setRoomNumber(uint16 roomNum) { _roomNumber = roomNum; } void setSupportData(CharacterScheduleEntry *newRec) { @@ -452,7 +452,7 @@ public: } void setSupportData(uint16 entryId); - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; static CurrentActionEntry *loadFromStream(Common::ReadStream *stream); }; @@ -505,7 +505,7 @@ public: validateStack(); } - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); void copyFrom(CurrentActionStack &stack); }; @@ -569,13 +569,13 @@ public: void enable() { flags |= 0x80; } void disable() { flags &= 0x7F; } Direction nonVisualDirection() { return (Direction) scriptLoadFlag; } - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; class HotspotDataList: public Common::List<Common::SharedPtr<HotspotData> > { public: - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -663,7 +663,7 @@ public: class TalkDataList: public Common::List<Common::SharedPtr<TalkData> > { public: - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -722,7 +722,7 @@ public: void tick(); void clear(bool forceClear = false); - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -760,8 +760,8 @@ public: RandomActionSet(uint16 *&offset); ~RandomActionSet(); - uint16 roomNumber() { return _roomNumber; } - int numActions() { return _numActions; } + uint16 roomNumber() const { return _roomNumber; } + int numActions() const { return _numActions; } void getEntry(int index, RandomActionType &actionType, uint16 &id) { assert((index >= 0) && (index < _numActions)); actionType = _types[index]; @@ -772,14 +772,14 @@ public: assert(_types[index] == REPEAT_ONCE); _types[index] = REPEAT_ONCE_DONE; } - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; class RandomActionList: public Common::List<Common::SharedPtr<RandomActionSet> > { public: RandomActionSet *getRoom(uint16 roomNumber); - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -828,7 +828,7 @@ public: void reset(); BarEntry &getDetails(uint16 roomNumber); - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; @@ -923,7 +923,7 @@ public: uint8 &hdrFlagMask() { return _hdrFlagMask; } PlayerNewPosition &playerNewPos() { return _playerNewPos; } - void saveToStream(Common::WriteStream *stream); + void saveToStream(Common::WriteStream *stream) const; void loadFromStream(Common::ReadStream *stream); }; diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index 219ed0263d..9a9313ece9 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -138,8 +138,8 @@ void Room::leaveRoom() { HotspotList &list = r.activeHotspots(); HotspotList::iterator i = list.begin(); while (i != list.end()) { - Hotspot *h = (i.operator*()).get(); - if (!h->persistant()) { + Hotspot const &h = **i; + if (!h.persistant()) { i = list.erase(i); } else { ++i; @@ -153,11 +153,11 @@ void Room::loadRoomHotspots() { HotspotDataList::iterator i; for (i = list.begin(); i != list.end(); ++i) { - HotspotData *rec = (*i).get(); + HotspotData const &rec = **i; - if ((rec->hotspotId < 0x7530) && (rec->roomNumber == _roomNumber) && - (rec->layer != 0)) - r.activateHotspot(rec->hotspotId); + if ((rec.hotspotId < 0x7530) && (rec.roomNumber == _roomNumber) && + (rec.layer != 0)) + r.activateHotspot(rec.hotspotId); } } @@ -252,24 +252,24 @@ CursorType Room::checkRoomExits() { RoomExitHotspotList::iterator i; for (i = exits.begin(); i != exits.end(); ++i) { - RoomExitHotspotData *rec = (*i).get(); + RoomExitHotspotData const &rec = **i; skipFlag = false; - if (rec->hotspotId != 0) { - join = res.getExitJoin(rec->hotspotId); + if (rec.hotspotId != 0) { + join = res.getExitJoin(rec.hotspotId); if ((join) && (join->blocked != 0)) skipFlag = true; } - if (!skipFlag && (m.x() >= rec->xs) && (m.x() <= rec->xe) && - (m.y() >= rec->ys) && (m.y() <= rec->ye)) { + if (!skipFlag && (m.x() >= rec.xs) && (m.x() <= rec.xe) && + (m.y() >= rec.ys) && (m.y() <= rec.ye)) { // Cursor is within exit area - CursorType cursorNum = (CursorType)rec->cursorNum; - _destRoomNumber = rec->destRoomNumber; + CursorType cursorNum = (CursorType)rec.cursorNum; + _destRoomNumber = rec.destRoomNumber; // If it's a hotspotted exit, change arrow to the + arrow - if (rec->hotspotId != 0) { - _hotspotId = rec->hotspotId; + if (rec.hotspotId != 0) { + _hotspotId = rec.hotspotId; _hotspot = res.getHotspot(_hotspotId); _hotspotNameId = _hotspot->nameId; _isExit = true; @@ -437,7 +437,7 @@ void Room::update() { // Handle first layer (layer 3) for (i = hotspots.begin(); i != hotspots.end(); ++i) { - Hotspot &h = *i.operator*(); + Hotspot &h = **i; if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 3)) { addAnimation(h); @@ -449,28 +449,28 @@ void Room::update() { Common::List<Hotspot *> tempList; Common::List<Hotspot *>::iterator iTemp; for (i = hotspots.begin(); i != hotspots.end(); ++i) { - Hotspot *h = (i.operator*()).get(); + Hotspot *h = i->get(); if ((h->layer() != 1) || (h->roomNumber() != _roomNumber) || h->skipFlag() || !h->isActiveAnimation()) continue; int16 endY = h->y() + h->heightCopy(); for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) { - Hotspot *hTemp = iTemp.operator*(); + Hotspot *hTemp = *iTemp; int16 tempY = hTemp->y() + hTemp->heightCopy(); if (endY < tempY) break; } tempList.insert(iTemp, h); } for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) { - Hotspot &h = *iTemp.operator*(); + Hotspot &h = **iTemp; addAnimation(h); addLayers(h); } // Handle third layer (layer 2) for (i = hotspots.begin(); i != hotspots.end(); ++i) { - Hotspot &h = *i.operator*(); + Hotspot &h = **i; if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 2)) { addAnimation(h); diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index bf0abdea07..298483bed8 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -107,8 +107,7 @@ void SoundManager::saveToStream(Common::WriteStream *stream) { SoundListIterator i; for (i = _activeSounds.begin(); i != _activeSounds.end(); ++i) { - SoundDescResource *rec = (*i).get(); - stream->writeByte(rec->soundNumber); + stream->writeByte((*i)->soundNumber); } stream->writeByte(0xff); } @@ -335,14 +334,14 @@ void SoundManager::tidySounds() { SoundListIterator i = _activeSounds.begin(); while (i != _activeSounds.end()) { - SoundDescResource *rec = (*i).get(); + SoundDescResource const &rec = **i; - if (musicInterface_CheckPlaying(rec->soundNumber)) + if (musicInterface_CheckPlaying(rec.soundNumber)) // Still playing, so move to next entry ++i; else { // Mark the channels that it used as now being free - Common::fill(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, false); + Common::fill(_channelsInUse + rec.channel, _channelsInUse + rec.channel + rec.numChannels, false); i = _activeSounds.erase(i); } @@ -356,10 +355,10 @@ void SoundManager::removeSounds() { SoundListIterator i = _activeSounds.begin(); while (i != _activeSounds.end()) { - SoundDescResource *rec = (*i).get(); + SoundDescResource const &rec = **i; - if ((rec->flags & SF_IN_USE) != 0) - musicInterface_Stop(rec->soundNumber); + if ((rec.flags & SF_IN_USE) != 0) + musicInterface_Stop(rec.soundNumber); ++i; } @@ -370,13 +369,13 @@ void SoundManager::restoreSounds() { SoundListIterator i = _activeSounds.begin(); while (i != _activeSounds.end()) { - SoundDescResource *rec = (*i).get(); + SoundDescResource const &rec = **i; - if ((rec->numChannels != 0) && ((rec->flags & SF_RESTORE) != 0)) { - Common::fill(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); + if ((rec.numChannels != 0) && ((rec.flags & SF_RESTORE) != 0)) { + Common::fill(_channelsInUse + rec.channel, _channelsInUse + rec.channel + rec.numChannels, true); - musicInterface_Play(rec->soundNumber, rec->channel, rec->numChannels); - musicInterface_SetVolume(rec->channel, rec->volume); + musicInterface_Play(rec.soundNumber, rec.channel, rec.numChannels); + musicInterface_SetVolume(rec.channel, rec.volume); } ++i; @@ -397,10 +396,10 @@ void SoundManager::fadeOut() { g_system->lockMutex(_soundMutex); MusicListIterator i; for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) { - MidiMusic *music = (*i).get(); - if (music->getVolume() > 0) { + MidiMusic &music = **i; + if (music.getVolume() > 0) { inProgress = true; - music->setVolume(music->getVolume() >= 10 ? (music->getVolume() - 10) : 0); + music.setVolume(music.getVolume() >= 10 ? music.getVolume() - 10 : 0); } } @@ -468,8 +467,7 @@ void SoundManager::musicInterface_Stop(uint8 soundNumber) { g_system->lockMutex(_soundMutex); MusicListIterator i; for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) { - MidiMusic *music = (*i).get(); - if (music->soundNumber() == soundNum) { + if ((*i)->soundNumber() == soundNum) { _playingSounds.erase(i); break; } @@ -489,8 +487,7 @@ bool SoundManager::musicInterface_CheckPlaying(uint8 soundNumber) { g_system->lockMutex(_soundMutex); MusicListIterator i; for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) { - MidiMusic *music = (*i).get(); - if (music->soundNumber() == soundNum) { + if ((*i)->soundNumber() == soundNum) { result = true; break; } @@ -511,9 +508,9 @@ void SoundManager::musicInterface_SetVolume(uint8 channelNum, uint8 volume) { g_system->lockMutex(_soundMutex); MusicListIterator i; for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) { - MidiMusic *music = (*i).get(); - if (music->channelNumber() == channelNum) - music->setVolume(volume); + MidiMusic &music = **i; + if (music.channelNumber() == channelNum) + music.setVolume(volume); } g_system->unlockMutex(_soundMutex); } @@ -528,8 +525,7 @@ void SoundManager::musicInterface_KillAll() { g_system->lockMutex(_soundMutex); MusicListIterator i; for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) { - MidiMusic *music = (*i).get(); - music->stopMusic(); + (*i)->stopMusic(); } _playingSounds.clear(); @@ -561,8 +557,7 @@ void SoundManager::musicInterface_TidySounds() { g_system->lockMutex(_soundMutex); MusicListIterator i = _playingSounds.begin(); while (i != _playingSounds.end()) { - MidiMusic *music = (*i).get(); - if (!music->isPlaying()) + if (!(*i)->isPlaying()) i = _playingSounds.erase(i); else ++i; @@ -583,9 +578,9 @@ void SoundManager::doTimer() { MusicListIterator i; for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) { - MidiMusic *music = (*i).get(); - if (music->isPlaying()) - music->onTimer(); + MidiMusic &music = **i; + if (music.isPlaying()) + music.onTimer(); } g_system->unlockMutex(_soundMutex); diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index bfada8fde6..4d63647af5 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -1329,8 +1329,8 @@ bool CopyProtectionDialog::show() { ++hotspot6; // Add wording header and display screen - (hotspot2->get())->setFrameNumber(1); - (hotspot2->get())->copyTo(&screen.screen()); + (*hotspot2)->setFrameNumber(1); + (*hotspot2)->copyTo(&screen.screen()); screen.update(); screen.setPalette(&p); @@ -1340,8 +1340,8 @@ bool CopyProtectionDialog::show() { } while (!events.interruptableDelay(100)); // Change title text to selection - (hotspot2->get())->setFrameNumber(0); - (hotspot2->get())->copyTo(&screen.screen()); + (*hotspot2)->setFrameNumber(0); + (*hotspot2)->copyTo(&screen.screen()); screen.update(); // Clear any prior try @@ -1356,8 +1356,8 @@ bool CopyProtectionDialog::show() { HotspotsList::iterator tmpHotspot = _hotspots.begin(); for (int i = 0; i < _charIndex + 3; i++) ++tmpHotspot; - (tmpHotspot->get())->setFrameNumber(10); // Blank space - (tmpHotspot->get())->copyTo(&screen.screen()); + (*tmpHotspot)->setFrameNumber(10); // Blank space + (*tmpHotspot)->copyTo(&screen.screen()); screen.update(); } else if ((events.event().kbd.keycode >= Common::KEYCODE_0) && @@ -1366,8 +1366,8 @@ bool CopyProtectionDialog::show() { for (int i = 0; i < _charIndex + 3; i++) ++tmpHotspot; // Number pressed - (tmpHotspot->get())->setFrameNumber(events.event().kbd.ascii - '0'); - (tmpHotspot->get())->copyTo(&screen.screen()); + (*tmpHotspot)->setFrameNumber(events.event().kbd.ascii - '0'); + (*tmpHotspot)->copyTo(&screen.screen()); ++_charIndex; } @@ -1385,11 +1385,11 @@ bool CopyProtectionDialog::show() { return false; // At this point, two page numbers have been entered - validate them - int page1 = ((hotspot3->get())->frameNumber() * 10) + (hotspot4->get())->frameNumber(); - int page2 = ((hotspot5->get())->frameNumber() * 10) + (hotspot6->get())->frameNumber(); + int page1 = ((*hotspot3)->frameNumber() * 10) + (*hotspot4)->frameNumber(); + int page2 = ((*hotspot5)->frameNumber() * 10) + (*hotspot6)->frameNumber(); - if ((page1 == pageNumbers[(hotspot0->get())->frameNumber()]) && - (page2 == pageNumbers[(hotspot1->get())->frameNumber()])) + if ((page1 == pageNumbers[(*hotspot0)->frameNumber()]) && + (page2 == pageNumbers[(*hotspot1)->frameNumber()])) return true; } @@ -1404,11 +1404,11 @@ void CopyProtectionDialog::chooseCharacters() { int char2 = rnd.getRandomNumber(19); HotspotsList::iterator curHotspot = _hotspots.begin(); - (curHotspot->get())->setFrameNumber(char1); - (curHotspot->get())->copyTo(&screen.screen()); + (*curHotspot)->setFrameNumber(char1); + (*curHotspot)->copyTo(&screen.screen()); ++curHotspot; - (curHotspot->get())->setFrameNumber(char2); - (curHotspot->get())->copyTo(&screen.screen()); + (*curHotspot)->setFrameNumber(char2); + (*curHotspot)->copyTo(&screen.screen()); screen.update(); } diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp index 0234c86c7e..a7a650d8ed 100644 --- a/engines/mohawk/console.cpp +++ b/engines/mohawk/console.cpp @@ -21,7 +21,6 @@ */ #include "mohawk/console.h" -#include "mohawk/graphics.h" #include "mohawk/livingbooks.h" #include "mohawk/sound.h" #include "mohawk/video.h" @@ -36,6 +35,7 @@ #ifdef ENABLE_MYST #include "mohawk/myst.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_scripts.h" #endif diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h index 0bc236f930..db06b9791e 100644 --- a/engines/mohawk/cstime.h +++ b/engines/mohawk/cstime.h @@ -25,7 +25,7 @@ #include "mohawk/mohawk.h" #include "mohawk/console.h" -#include "mohawk/graphics.h" +#include "mohawk/cstime_graphics.h" #include "common/random.h" #include "common/list.h" diff --git a/engines/mohawk/cstime_graphics.cpp b/engines/mohawk/cstime_graphics.cpp new file mode 100644 index 0000000000..3a1452e67c --- /dev/null +++ b/engines/mohawk/cstime_graphics.cpp @@ -0,0 +1,64 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mohawk/cstime.h" +#include "mohawk/cstime_graphics.h" +#include "mohawk/resource.h" + +#include "common/system.h" +#include "engines/util.h" + +namespace Mohawk { + +CSTimeGraphics::CSTimeGraphics(MohawkEngine_CSTime *vm) : GraphicsManager(), _vm(vm) { + _bmpDecoder = new MohawkBitmap(); + + initGraphics(640, 480, true); +} + +CSTimeGraphics::~CSTimeGraphics() { + delete _bmpDecoder; +} + +void CSTimeGraphics::drawRect(Common::Rect rect, byte color) { + rect.clip(Common::Rect(640, 480)); + + // Useful with debugging. Shows where hotspots are on the screen and whether or not they're active. + if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0) + return; + + Graphics::Surface *screen = _vm->_system->lockScreen(); + + screen->frameRect(rect, color); + + _vm->_system->unlockScreen(); +} + +MohawkSurface *CSTimeGraphics::decodeImage(uint16 id) { + return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id)); +} + +Common::Array<MohawkSurface *> CSTimeGraphics::decodeImages(uint16 id) { + return _bmpDecoder->decodeImages(_vm->getResource(ID_TBMH, id)); +} + +} // End of namespace Mohawk diff --git a/engines/mohawk/cstime_graphics.h b/engines/mohawk/cstime_graphics.h new file mode 100644 index 0000000000..5f034f47f4 --- /dev/null +++ b/engines/mohawk/cstime_graphics.h @@ -0,0 +1,51 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MOHAWK_CSTIME_GRAPHICS_H +#define MOHAWK_CSTIME_GRAPHICS_H + +#include "mohawk/graphics.h" + +namespace Mohawk { + +class MohawkEngine_CSTime; + +class CSTimeGraphics : public GraphicsManager { +public: + CSTimeGraphics(MohawkEngine_CSTime *vm); + ~CSTimeGraphics(); + + void drawRect(Common::Rect rect, byte color); + +protected: + MohawkSurface *decodeImage(uint16 id); + Common::Array<MohawkSurface *> decodeImages(uint16 id); + MohawkEngine *getVM() { return (MohawkEngine *)_vm; } + +private: + MohawkBitmap *_bmpDecoder; + MohawkEngine_CSTime *_vm; +}; + +} // End of namespace Mohawk + +#endif diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h index 08df0a2cbe..5acc1bb179 100644 --- a/engines/mohawk/detection_tables.h +++ b/engines/mohawk/detection_tables.h @@ -376,7 +376,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, - GUIO1(GUIO_NOASPECT) + GUIO2(GUIO_NOASPECT, GUIO_NOLAUNCHLOAD) }, GType_RIVEN, GF_DEMO, diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index 2ffabf1e8c..a08d034ef7 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -20,30 +20,13 @@ * */ +#include "mohawk/mohawk.h" #include "mohawk/resource.h" #include "mohawk/graphics.h" -#include "mohawk/livingbooks.h" -#include "common/substream.h" #include "common/system.h" -#include "common/textconsole.h" #include "engines/util.h" #include "graphics/palette.h" -#include "graphics/primitives.h" -#include "gui/message.h" - -#ifdef ENABLE_CSTIME -#include "mohawk/cstime.h" -#endif - -#ifdef ENABLE_MYST -#include "mohawk/myst.h" -#include "graphics/jpeg.h" -#endif - -#ifdef ENABLE_RIVEN -#include "mohawk/riven.h" -#endif namespace Mohawk { @@ -262,986 +245,4 @@ void GraphicsManager::addImageToCache(uint16 id, MohawkSurface *surface) { _cache[id] = surface; } -#ifdef ENABLE_MYST - -MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) { - _bmpDecoder = new MystBitmap(); - - _viewport = Common::Rect(544, 332); - - // The original version of Myst could run in 8bpp color too. - // However, it dithered videos to 8bpp and they looked considerably - // worse (than they already did :P). So we're not even going to - // support 8bpp mode in Myst (Myst ME required >8bpp anyway). - initGraphics(_viewport.width(), _viewport.height(), true, NULL); // What an odd screen size! - - _pixelFormat = _vm->_system->getScreenFormat(); - - if (_pixelFormat.bytesPerPixel == 1) - error("Myst requires greater than 256 colors to run"); - - if (_vm->getFeatures() & GF_ME) { - _jpegDecoder = new Graphics::JPEG(); - _pictDecoder = new Graphics::PictDecoder(_pixelFormat); - } else { - _jpegDecoder = NULL; - _pictDecoder = NULL; - } - - _pictureFile.entries = NULL; - - // Initialize our buffer - _backBuffer = new Graphics::Surface(); - _backBuffer->create(_vm->_system->getWidth(), _vm->_system->getHeight(), _pixelFormat); - - _nextAllowedDrawTime = _vm->_system->getMillis(); - _enableDrawingTimeSimulation = 0; -} - -MystGraphics::~MystGraphics() { - delete _bmpDecoder; - delete _jpegDecoder; - delete _pictDecoder; - delete[] _pictureFile.entries; - - _backBuffer->free(); - delete _backBuffer; -} - -static const char *s_picFileNames[] = { - "CHpics", - "", - "", - "DUpics", - "INpics", - "", - "MEpics", - "MYpics", - "SEpics", - "", - "", - "STpics" -}; - -void MystGraphics::loadExternalPictureFile(uint16 stack) { - if (_vm->getPlatform() != Common::kPlatformMacintosh) - return; - - if (_pictureFile.picFile.isOpen()) - _pictureFile.picFile.close(); - delete[] _pictureFile.entries; - - if (!scumm_stricmp(s_picFileNames[stack], "")) - return; - - if (!_pictureFile.picFile.open(s_picFileNames[stack])) - error ("Could not open external picture file \'%s\'", s_picFileNames[stack]); - - _pictureFile.pictureCount = _pictureFile.picFile.readUint32BE(); - _pictureFile.entries = new PictureFile::PictureEntry[_pictureFile.pictureCount]; - - for (uint32 i = 0; i < _pictureFile.pictureCount; i++) { - _pictureFile.entries[i].offset = _pictureFile.picFile.readUint32BE(); - _pictureFile.entries[i].size = _pictureFile.picFile.readUint32BE(); - _pictureFile.entries[i].id = _pictureFile.picFile.readUint16BE(); - _pictureFile.entries[i].type = _pictureFile.picFile.readUint16BE(); - _pictureFile.entries[i].width = _pictureFile.picFile.readUint16BE(); - _pictureFile.entries[i].height = _pictureFile.picFile.readUint16BE(); - } -} - -MohawkSurface *MystGraphics::decodeImage(uint16 id) { - MohawkSurface *mhkSurface = 0; - - // Myst ME uses JPEG/PICT images instead of compressed Windows Bitmaps for room images, - // though there are a few weird ones that use that format. For further nonsense with images, - // the Macintosh version stores images in external "picture files." We check them before - // going to check for a PICT resource. - if (_vm->getFeatures() & GF_ME && _vm->getPlatform() == Common::kPlatformMacintosh && _pictureFile.picFile.isOpen()) { - for (uint32 i = 0; i < _pictureFile.pictureCount; i++) - if (_pictureFile.entries[i].id == id) { - if (_pictureFile.entries[i].type == 0) { - Common::SeekableReadStream *stream = new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size); - - if (!_jpegDecoder->read(stream)) - error("Could not decode Myst ME Mac JPEG"); - - mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat)); - delete stream; - } else if (_pictureFile.entries[i].type == 1) { - mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size))); - } else - error ("Unknown Picture File type %d", _pictureFile.entries[i].type); - break; - } - } - - // We're not using the external Mac files, so it's time to delve into the main Mohawk - // archives. However, we still don't know if it's a PICT or WDIB resource. If it's Myst - // ME it's most likely a PICT, and if it's original it's definitely a WDIB. However, - // Myst ME throws us another curve ball in that PICT resources can contain WDIB's instead - // of PICT's. - if (!mhkSurface) { - bool isPict = false; - Common::SeekableReadStream *dataStream = NULL; - - if (_vm->getFeatures() & GF_ME && _vm->hasResource(ID_PICT, id)) { - // The PICT resource exists. However, it could still contain a MystBitmap - // instead of a PICT image... - dataStream = _vm->getResource(ID_PICT, id); - } else // No PICT, so the WDIB must exist. Let's go grab it. - dataStream = _vm->getResource(ID_WDIB, id); - - if (_vm->getFeatures() & GF_ME) { - // Here we detect whether it's really a PICT or a WDIB. Since a MystBitmap - // would be compressed, there's no way to detect for the BM without a hack. - // So, we search for the PICT version opcode for detection. - dataStream->seek(512 + 10); // 512 byte pict header - isPict = (dataStream->readUint32BE() == 0x001102FF); - dataStream->seek(0); - } - - if (isPict) - mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(dataStream)); - else { - mhkSurface = _bmpDecoder->decodeImage(dataStream); - mhkSurface->convertToTrueColor(); - } - } - - assert(mhkSurface); - return mhkSurface; -} - -void MystGraphics::copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest) { - Graphics::Surface *surface = findImage(image)->getSurface(); - - // Make sure the image is bottom aligned in the dest rect - dest.top = dest.bottom - MIN<int>(surface->h, dest.height()); - - // Convert from bitmap coordinates to surface coordinates - uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height())); - - // Do not draw the top pixels if the image is too tall - if (dest.height() > _viewport.height()) - top += dest.height() - _viewport.height(); - - // Clip the destination rect to the screen - if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight()) - dest.debugPrint(4, "Clipping destination rect to the screen"); - dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth()); - dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight()); - - uint16 width = MIN<int>(surface->w, dest.width()); - uint16 height = MIN<int>(surface->h, dest.height()); - - // Clamp Width and Height to within src surface dimensions - if (src.left + width > surface->w) - width = surface->w - src.left; - if (src.top + height > surface->h) - height = surface->h - src.top; - - debug(3, "MystGraphics::copyImageSectionToScreen()"); - debug(3, "\tImage: %d", image); - debug(3, "\tsrc.left: %d", src.left); - debug(3, "\tsrc.top: %d", src.top); - debug(3, "\tdest.left: %d", dest.left); - debug(3, "\tdest.top: %d", dest.top); - debug(3, "\twidth: %d", width); - debug(3, "\theight: %d", height); - - simulatePreviousDrawDelay(dest); - - _vm->_system->copyRectToScreen((byte *)surface->getBasePtr(src.left, top), surface->pitch, dest.left, dest.top, width, height); -} - -void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest) { - Graphics::Surface *surface = findImage(image)->getSurface(); - - // Make sure the image is bottom aligned in the dest rect - dest.top = dest.bottom - MIN<int>(surface->h, dest.height()); - - // Convert from bitmap coordinates to surface coordinates - uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height())); - - // Do not draw the top pixels if the image is too tall - if (dest.height() > _viewport.height()) { - top += dest.height() - _viewport.height(); - } - - // Clip the destination rect to the screen - if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight()) - dest.debugPrint(4, "Clipping destination rect to the screen"); - dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth()); - dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight()); - - uint16 width = MIN<int>(surface->w, dest.width()); - uint16 height = MIN<int>(surface->h, dest.height()); - - // Clamp Width and Height to within src surface dimensions - if (src.left + width > surface->w) - width = surface->w - src.left; - if (src.top + height > surface->h) - height = surface->h - src.top; - - debug(3, "MystGraphics::copyImageSectionToBackBuffer()"); - debug(3, "\tImage: %d", image); - debug(3, "\tsrc.left: %d", src.left); - debug(3, "\tsrc.top: %d", src.top); - debug(3, "\tdest.left: %d", dest.left); - debug(3, "\tdest.top: %d", dest.top); - debug(3, "\twidth: %d", width); - debug(3, "\theight: %d", height); - - for (uint16 i = 0; i < height; i++) - memcpy(_backBuffer->getBasePtr(dest.left, i + dest.top), surface->getBasePtr(src.left, top + i), width * surface->format.bytesPerPixel); -} - -void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) { - copyImageSectionToScreen(image, Common::Rect(544, 333), dest); -} - -void MystGraphics::copyImageToBackBuffer(uint16 image, Common::Rect dest) { - copyImageSectionToBackBuffer(image, Common::Rect(544, 333), dest); -} - -void MystGraphics::copyBackBufferToScreen(Common::Rect r) { - r.clip(_viewport); - - simulatePreviousDrawDelay(r); - - _vm->_system->copyRectToScreen((byte *)_backBuffer->getBasePtr(r.left, r.top), _backBuffer->pitch, r.left, r.top, r.width(), r.height()); -} - -void MystGraphics::runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay) { - - // Do not artificially delay during transitions - int oldEnableDrawingTimeSimulation = _enableDrawingTimeSimulation; - _enableDrawingTimeSimulation = 0; - - switch (type) { - case 0: { - debugC(kDebugScript, "Left to Right"); - - uint16 step = (rect.right - rect.left) / steps; - Common::Rect area = rect; - for (uint i = 0; i < steps; i++) { - area.left = rect.left + step * i; - area.right = area.left + step; - - _vm->_system->delayMillis(delay); - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - if (area.right < rect.right) { - area.left = area.right; - area.right = rect.right; - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - } - break; - case 1: { - debugC(kDebugScript, "Right to Left"); - - uint16 step = (rect.right - rect.left) / steps; - Common::Rect area = rect; - for (uint i = 0; i < steps; i++) { - area.right = rect.right - step * i; - area.left = area.right - step; - - _vm->_system->delayMillis(delay); - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - if (area.left > rect.left) { - area.right = area.left; - area.left = rect.left; - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - } - break; - case 5: { - debugC(kDebugScript, "Top to Bottom"); - - uint16 step = (rect.bottom - rect.top) / steps; - Common::Rect area = rect; - for (uint i = 0; i < steps; i++) { - area.top = rect.top + step * i; - area.bottom = area.top + step; - - _vm->_system->delayMillis(delay); - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - if (area.bottom < rect.bottom) { - area.top = area.bottom; - area.bottom = rect.bottom; - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - } - break; - case 6: { - debugC(kDebugScript, "Bottom to Top"); - - uint16 step = (rect.bottom - rect.top) / steps; - Common::Rect area = rect; - for (uint i = 0; i < steps; i++) { - area.bottom = rect.bottom - step * i; - area.top = area.bottom - step; - - _vm->_system->delayMillis(delay); - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - if (area.top > rect.top) { - area.bottom = area.top; - area.top = rect.top; - - copyBackBufferToScreen(area); - _vm->_system->updateScreen(); - } - } - break; - default: - warning("Unknown Update Direction"); - - //TODO: Replace minimal implementation - copyBackBufferToScreen(rect); - _vm->_system->updateScreen(); - break; - } - - _enableDrawingTimeSimulation = oldEnableDrawingTimeSimulation; -} - -void MystGraphics::drawRect(Common::Rect rect, RectState state) { - rect.clip(_viewport); - - // Useful with debugging. Shows where hotspots are on the screen and whether or not they're active. - if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0) - return; - - Graphics::Surface *screen = _vm->_system->lockScreen(); - - if (state == kRectEnabled) - screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0)); - else if (state == kRectUnreachable) - screen->frameRect(rect, _pixelFormat.RGBToColor(0, 0, 255)); - else - screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0)); - - _vm->_system->unlockScreen(); -} - -void MystGraphics::drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color) { - _backBuffer->drawLine(p1.x, p1.y, p2.x, p2.y, color); -} - -void MystGraphics::enableDrawingTimeSimulation(bool enable) { - if (enable) - _enableDrawingTimeSimulation++; - else - _enableDrawingTimeSimulation--; - - if (_enableDrawingTimeSimulation < 0) - _enableDrawingTimeSimulation = 0; -} - -void MystGraphics::simulatePreviousDrawDelay(const Common::Rect &dest) { - uint32 time = 0; - - if (_enableDrawingTimeSimulation) { - time = _vm->_system->getMillis(); - - // Do not draw anything new too quickly after the previous draw call - // so that images stay at least a little while on screen - // This is enabled only for scripted draw calls - if (time < _nextAllowedDrawTime) - _vm->_system->delayMillis(_nextAllowedDrawTime - time); - } - - // Next draw call allowed at DELAY + AERA * COEFF milliseconds from now - time = _vm->_system->getMillis(); - _nextAllowedDrawTime = time + _constantDrawDelay + dest.height() * dest.width() / _proportionalDrawDelay; -} - -void MystGraphics::copyBackBufferToScreenWithSaturation(int16 saturation) { - Graphics::Surface *screen = _vm->_system->lockScreen(); - - for (uint16 y = 0; y < _viewport.height(); y++) - for (uint16 x = 0; x < _viewport.width(); x++) { - uint32 color; - uint8 r, g, b; - - if (_pixelFormat.bytesPerPixel == 2) - color = *(const uint16 *)_backBuffer->getBasePtr(x, y); - else - color = *(const uint32 *)_backBuffer->getBasePtr(x, y); - - _pixelFormat.colorToRGB(color, r, g, b); - - r = CLIP<int16>((int16)r - saturation, 0, 255); - g = CLIP<int16>((int16)g - saturation, 0, 255); - b = CLIP<int16>((int16)b - saturation, 0, 255); - - color = _pixelFormat.RGBToColor(r, g, b); - - if (_pixelFormat.bytesPerPixel == 2) { - uint16 *dst = (uint16 *)screen->getBasePtr(x, y); - *dst = color; - } else { - uint32 *dst = (uint32 *)screen->getBasePtr(x, y); - *dst = color; - } - } - - _vm->_system->unlockScreen(); - _vm->_system->updateScreen(); -} - -void MystGraphics::fadeToBlack() { - for (int16 i = 0; i < 256; i += 32) { - copyBackBufferToScreenWithSaturation(i); - } -} - -void MystGraphics::fadeFromBlack() { - for (int16 i = 256; i >= 0; i -= 32) { - copyBackBufferToScreenWithSaturation(i); - } -} - -#endif // ENABLE_MYST - -#ifdef ENABLE_RIVEN - -RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) : GraphicsManager(), _vm(vm) { - _bitmapDecoder = new MohawkBitmap(); - - // Give me the best you've got! - initGraphics(608, 436, true, NULL); - _pixelFormat = _vm->_system->getScreenFormat(); - - if (_pixelFormat.bytesPerPixel == 1) - error("Riven requires greater than 256 colors to run"); - - // The actual game graphics only take up the first 392 rows. The inventory - // occupies the rest of the screen and we don't use the buffer to hold that. - _mainScreen = new Graphics::Surface(); - _mainScreen->create(608, 392, _pixelFormat); - - _updatesEnabled = true; - _scheduledTransition = -1; // no transition - _dirtyScreen = false; - _inventoryDrawn = false; - - _creditsImage = 302; - _creditsPos = 0; -} - -RivenGraphics::~RivenGraphics() { - _mainScreen->free(); - delete _mainScreen; - delete _bitmapDecoder; -} - -MohawkSurface *RivenGraphics::decodeImage(uint16 id) { - MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getResource(ID_TBMP, id)); - surface->convertToTrueColor(); - return surface; -} - -void RivenGraphics::copyImageToScreen(uint16 image, uint32 left, uint32 top, uint32 right, uint32 bottom) { - Graphics::Surface *surface = findImage(image)->getSurface(); - - // Clip the width to fit on the screen. Fixes some images. - if (left + surface->w > 608) - surface->w = 608 - left; - - for (uint16 i = 0; i < surface->h; i++) - memcpy(_mainScreen->getBasePtr(left, i + top), surface->getBasePtr(0, i), surface->w * surface->format.bytesPerPixel); - - _dirtyScreen = true; -} - -void RivenGraphics::drawPLST(uint16 x) { - Common::SeekableReadStream* plst = _vm->getResource(ID_PLST, _vm->getCurCard()); - uint16 recordCount = plst->readUint16BE(); - - for (uint16 i = 0; i < recordCount; i++) { - uint16 index = plst->readUint16BE(); - uint16 id = plst->readUint16BE(); - uint16 left = plst->readUint16BE(); - uint16 top = plst->readUint16BE(); - uint16 right = plst->readUint16BE(); - uint16 bottom = plst->readUint16BE(); - - // We are also checking here to make sure we haven't drawn the image yet on screen. - // This fixes problems with drawing PLST 1 twice and some other images twice. PLST - // 1 is sometimes not called by the scripts, so some cards don't appear if we don't - // draw PLST 1 each time. This "hack" is here to catch any PLST attempting to draw - // twice. There should never be a problem with doing it this way. - if (index == x && !(Common::find(_activatedPLSTs.begin(), _activatedPLSTs.end(), x) != _activatedPLSTs.end())) { - debug(0, "Drawing image %d", id); - copyImageToScreen(id, left, top, right, bottom); - _activatedPLSTs.push_back(x); - break; - } - } - - delete plst; -} - -void RivenGraphics::updateScreen(Common::Rect updateRect) { - if (_updatesEnabled) { - _vm->runUpdateScreenScript(); - - if (_dirtyScreen) { - _activatedPLSTs.clear(); - - // Copy to screen if there's no transition. Otherwise transition. ;) - if (_scheduledTransition < 0) - _vm->_system->copyRectToScreen((byte *)_mainScreen->getBasePtr(updateRect.left, updateRect.top), _mainScreen->pitch, updateRect.left, updateRect.top, updateRect.width(), updateRect.height()); - else - runScheduledTransition(); - - // Finally, update the screen. - _vm->_system->updateScreen(); - _dirtyScreen = false; - } - } -} - -void RivenGraphics::scheduleWaterEffect(uint16 sfxeID) { - Common::SeekableReadStream *sfxeStream = _vm->getResource(ID_SFXE, sfxeID); - - if (sfxeStream->readUint16BE() != 'SL') - error ("Unknown sfxe tag"); - - // Read in header info - SFXERecord sfxeRecord; - sfxeRecord.frameCount = sfxeStream->readUint16BE(); - uint32 offsetTablePosition = sfxeStream->readUint32BE(); - sfxeRecord.rect.left = sfxeStream->readUint16BE(); - sfxeRecord.rect.top = sfxeStream->readUint16BE(); - sfxeRecord.rect.right = sfxeStream->readUint16BE(); - sfxeRecord.rect.bottom = sfxeStream->readUint16BE(); - sfxeRecord.speed = sfxeStream->readUint16BE(); - // Skip the rest of the fields... - - // Read in offsets - sfxeStream->seek(offsetTablePosition); - uint32 *frameOffsets = new uint32[sfxeRecord.frameCount]; - for (uint16 i = 0; i < sfxeRecord.frameCount; i++) - frameOffsets[i] = sfxeStream->readUint32BE(); - sfxeStream->seek(frameOffsets[0]); - - // Read in the scripts - for (uint16 i = 0; i < sfxeRecord.frameCount; i++) - sfxeRecord.frameScripts.push_back(sfxeStream->readStream((i == sfxeRecord.frameCount - 1) ? sfxeStream->size() - frameOffsets[i] : frameOffsets[i + 1] - frameOffsets[i])); - - // Set it to the first frame - sfxeRecord.curFrame = 0; - sfxeRecord.lastFrameTime = 0; - - delete[] frameOffsets; - delete sfxeStream; - _waterEffects.push_back(sfxeRecord); -} - -void RivenGraphics::clearWaterEffects() { - _waterEffects.clear(); -} - -bool RivenGraphics::runScheduledWaterEffects() { - // Don't run the effect if it's disabled - if (_vm->_vars["waterenabled"] == 0) - return false; - - Graphics::Surface *screen = NULL; - - for (uint16 i = 0; i < _waterEffects.size(); i++) { - if (_vm->_system->getMillis() > _waterEffects[i].lastFrameTime + 1000 / _waterEffects[i].speed) { - // Lock the screen! - if (!screen) - screen = _vm->_system->lockScreen(); - - // Make sure the script is at the starting point - Common::SeekableReadStream *script = _waterEffects[i].frameScripts[_waterEffects[i].curFrame]; - if (script->pos() != 0) - script->seek(0); - - // Run script - uint16 curRow = 0; - for (uint16 op = script->readUint16BE(); op != 4; op = script->readUint16BE()) { - if (op == 1) { // Increment Row - curRow++; - } else if (op == 3) { // Copy Pixels - uint16 dstLeft = script->readUint16BE(); - uint16 srcLeft = script->readUint16BE(); - uint16 srcTop = script->readUint16BE(); - uint16 rowWidth = script->readUint16BE(); - memcpy ((byte *)screen->getBasePtr(dstLeft, curRow + _waterEffects[i].rect.top), (byte *)_mainScreen->getBasePtr(srcLeft, srcTop), rowWidth * _pixelFormat.bytesPerPixel); - } else if (op != 4) { // End of Script - error ("Unknown SFXE opcode %d", op); - } - } - - // Increment frame - _waterEffects[i].curFrame++; - if (_waterEffects[i].curFrame == _waterEffects[i].frameCount) - _waterEffects[i].curFrame = 0; - - // Set the new time - _waterEffects[i].lastFrameTime = _vm->_system->getMillis(); - } - } - - // Unlock the screen if it has been locked and return true to update the screen - if (screen) { - _vm->_system->unlockScreen(); - return true; - } - - return false; -} - -void RivenGraphics::scheduleTransition(uint16 id, Common::Rect rect) { - _scheduledTransition = id; - _transitionRect = rect; -} - -void RivenGraphics::runScheduledTransition() { - if (_scheduledTransition < 0) // No transition is scheduled - return; - - // TODO: There's a lot to be done here... - - // Note: Transitions 0-11 are actual transitions, but none are used in-game. - // There's no point in implementing them if they're not used. These extra - // transitions were found by hacking scripts. - - switch (_scheduledTransition) { - case 0: // Swipe Left - case 1: // Swipe Right - case 2: // Swipe Up - case 3: // Swipe Down - case 12: // Pan Left - case 13: // Pan Right - case 14: // Pan Up - case 15: // Pan Down - case 16: // Dissolve - case 17: // Dissolve (tspit CARD 155) - break; - default: - if (_scheduledTransition >= 4 && _scheduledTransition <= 11) - error("Found unused transition %d", _scheduledTransition); - else - error("Found unknown transition %d", _scheduledTransition); - } - - // For now, just copy the image to screen without doing any transition. - _vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h); - _vm->_system->updateScreen(); - - _scheduledTransition = -1; // Clear scheduled transition -} - -void RivenGraphics::clearMainScreen() { - _mainScreen->fillRect(Common::Rect(0, 0, 608, 392), _pixelFormat.RGBToColor(0, 0, 0)); -} - -void RivenGraphics::fadeToBlack() { - // The transition speed is forced to best here - setTransitionSpeed(kRivenTransitionSpeedBest); - scheduleTransition(16); - clearMainScreen(); - runScheduledTransition(); -} - -void RivenGraphics::showInventory() { - // Don't redraw the inventory - if (_inventoryDrawn) - return; - - // Clear the inventory area - clearInventoryArea(); - - // Draw the demo's exit button - if (_vm->getFeatures() & GF_DEMO) { - // extras.mhk tBMP 101 contains "EXIT" instead of Atrus' journal in the demo! - // The demo's extras.mhk contains all the other inventory/marble/credits image - // but has hacked tBMP 101 with "EXIT". *sigh* - drawInventoryImage(101, g_demoExitRect); - } else { - // We don't want to show the inventory on setup screens or in other journals. - if (_vm->getCurStack() == aspit) - return; - - // There are three books and three vars. We have three different - // combinations. At the start you have just Atrus' journal. Later, - // you get Catherine's journal and the trap book. Near the end, - // you lose the trap book and have just the two journals. - - bool hasCathBook = _vm->_vars["acathbook"] != 0; - bool hasTrapBook = _vm->_vars["atrapbook"] != 0; - - if (!hasCathBook) { - drawInventoryImage(101, g_atrusJournalRect1); - } else if (!hasTrapBook) { - drawInventoryImage(101, g_atrusJournalRect2); - drawInventoryImage(102, g_cathJournalRect2); - } else { - drawInventoryImage(101, g_atrusJournalRect3); - drawInventoryImage(102, g_cathJournalRect3); - drawInventoryImage(100, g_trapBookRect3); - } - } - - _vm->_system->updateScreen(); - _inventoryDrawn = true; -} - -void RivenGraphics::hideInventory() { - // Don't hide the inventory twice - if (!_inventoryDrawn) - return; - - // Clear the area - clearInventoryArea(); - - _inventoryDrawn = false; -} - -void RivenGraphics::clearInventoryArea() { - // Clear the inventory area - static const Common::Rect inventoryRect = Common::Rect(0, 392, 608, 436); - - // Lock the screen - Graphics::Surface *screen = _vm->_system->lockScreen(); - - // Fill the inventory area with black - screen->fillRect(inventoryRect, _pixelFormat.RGBToColor(0, 0, 0)); - - _vm->_system->unlockScreen(); -} - -void RivenGraphics::drawInventoryImage(uint16 id, const Common::Rect *rect) { - MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id)); - mhkSurface->convertToTrueColor(); - Graphics::Surface *surface = mhkSurface->getSurface(); - - _vm->_system->copyRectToScreen((byte *)surface->pixels, surface->pitch, rect->left, rect->top, surface->w, surface->h); - - delete mhkSurface; -} - -void RivenGraphics::drawRect(Common::Rect rect, bool active) { - // Useful with debugging. Shows where hotspots are on the screen and whether or not they're active. - Graphics::Surface *screen = _vm->_system->lockScreen(); - - if (active) - screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0)); - else - screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0)); - - _vm->_system->unlockScreen(); -} - -void RivenGraphics::drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect) { - // Draw tBMP id from srcRect to dstRect - Graphics::Surface *surface = findImage(id)->getSurface(); - - assert(srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height()); - - for (uint16 i = 0; i < srcRect.height(); i++) - memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(srcRect.left, i + srcRect.top), srcRect.width() * surface->format.bytesPerPixel); - - _dirtyScreen = true; -} - -void RivenGraphics::drawExtrasImage(uint16 id, Common::Rect dstRect) { - MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id)); - mhkSurface->convertToTrueColor(); - Graphics::Surface *surface = mhkSurface->getSurface(); - - assert(dstRect.width() == surface->w); - - for (uint16 i = 0; i < surface->h; i++) - memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(0, i), surface->pitch); - - delete mhkSurface; - _dirtyScreen = true; -} - -void RivenGraphics::beginCredits() { - // Clear the old cache - clearCache(); - - // Now cache all the credits images - for (uint16 i = 302; i <= 320; i++) { - MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, i)); - surface->convertToTrueColor(); - addImageToCache(i, surface); - } - - // And clear our screen too - clearMainScreen(); -} - -void RivenGraphics::updateCredits() { - if ((_creditsImage == 303 || _creditsImage == 304) && _creditsPos == 0) - fadeToBlack(); - - if (_creditsImage < 304) { - // For the first two credit images, they are faded from black to the image and then out again - scheduleTransition(16); - - Graphics::Surface *frame = findImage(_creditsImage++)->getSurface(); - - for (int y = 0; y < frame->h; y++) - memcpy(_mainScreen->getBasePtr(124, y), frame->getBasePtr(0, y), frame->pitch); - - runScheduledTransition(); - } else { - // Otheriwse, we're scrolling - // Move the screen up one row - memmove(_mainScreen->pixels, _mainScreen->getBasePtr(0, 1), _mainScreen->pitch * (_mainScreen->h - 1)); - - // Only update as long as we're not before the last frame - // Otherwise, we're just moving up a row (which we already did) - if (_creditsImage <= 320) { - // Copy the next row to the bottom of the screen - Graphics::Surface *frame = findImage(_creditsImage)->getSurface(); - memcpy(_mainScreen->getBasePtr(124, _mainScreen->h - 1), frame->getBasePtr(0, _creditsPos), frame->pitch); - _creditsPos++; - - if (_creditsPos == _mainScreen->h) { - _creditsImage++; - _creditsPos = 0; - } - } - - // Now flush the new screen - _vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h); - _vm->_system->updateScreen(); - } -} - -#endif // ENABLE_RIVEN - -LBGraphics::LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height) : GraphicsManager(), _vm(vm) { - _bmpDecoder = _vm->isPreMohawk() ? new LivingBooksBitmap_v1() : new MohawkBitmap(); - - initGraphics(width, height, true); -} - -LBGraphics::~LBGraphics() { - delete _bmpDecoder; -} - -MohawkSurface *LBGraphics::decodeImage(uint16 id) { - if (_vm->isPreMohawk()) - return _bmpDecoder->decodeImage(_vm->wrapStreamEndian(ID_BMAP, id)); - - return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id)); -} - -void LBGraphics::copyOffsetAnimImageToScreen(uint16 image, int left, int top) { - MohawkSurface *mhkSurface = findImage(image); - - left -= mhkSurface->getOffsetX(); - top -= mhkSurface->getOffsetY(); - - GraphicsManager::copyAnimImageToScreen(image, left, top); -} - -bool LBGraphics::imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y) { - MohawkSurface *mhkSurface = findImage(image); - - if (useOffsets) { - x += mhkSurface->getOffsetX(); - y += mhkSurface->getOffsetY(); - } - - if (x < 0 || y < 0) - return true; - - Graphics::Surface *surface = mhkSurface->getSurface(); - if (x >= surface->w || y >= surface->h) - return true; - - return *(byte *)surface->getBasePtr(x, y) == 0; -} - -void LBGraphics::setPalette(uint16 id) { - // Old Living Books games use the old CTBL-style palette format while newer - // games use the better tPAL format which can store partial palettes. - if (_vm->isPreMohawk()) { - Common::SeekableSubReadStreamEndian *ctblStream = _vm->wrapStreamEndian(ID_CTBL, id); - uint16 colorCount = ctblStream->readUint16(); - byte *palette = new byte[colorCount * 3]; - - for (uint16 i = 0; i < colorCount; i++) { - palette[i * 3 + 0] = ctblStream->readByte(); - palette[i * 3 + 1] = ctblStream->readByte(); - palette[i * 3 + 2] = ctblStream->readByte(); - ctblStream->readByte(); - } - - delete ctblStream; - - _vm->_system->getPaletteManager()->setPalette(palette, 0, colorCount); - delete[] palette; - } else { - GraphicsManager::setPalette(id); - } -} - -#ifdef ENABLE_CSTIME - -CSTimeGraphics::CSTimeGraphics(MohawkEngine_CSTime *vm) : GraphicsManager(), _vm(vm) { - _bmpDecoder = new MohawkBitmap(); - - initGraphics(640, 480, true); -} - -CSTimeGraphics::~CSTimeGraphics() { - delete _bmpDecoder; -} - -void CSTimeGraphics::drawRect(Common::Rect rect, byte color) { - rect.clip(Common::Rect(640, 480)); - - // Useful with debugging. Shows where hotspots are on the screen and whether or not they're active. - if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0) - return; - - Graphics::Surface *screen = _vm->_system->lockScreen(); - - screen->frameRect(rect, color); - - _vm->_system->unlockScreen(); -} - -MohawkSurface *CSTimeGraphics::decodeImage(uint16 id) { - return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id)); -} - -Common::Array<MohawkSurface *> CSTimeGraphics::decodeImages(uint16 id) { - return _bmpDecoder->decodeImages(_vm->getResource(ID_TBMH, id)); -} - -#endif - } // End of namespace Mohawk diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index 8fa5d5f895..51d25db5d9 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -25,12 +25,11 @@ #include "mohawk/bitmap.h" -#include "common/file.h" #include "common/hashmap.h" -#include "graphics/pict.h" +#include "common/rect.h" namespace Graphics { -class JPEG; +struct Surface; } namespace Mohawk { @@ -103,196 +102,6 @@ private: Common::HashMap<uint16, Common::Array<MohawkSurface *> > _subImageCache; }; -#ifdef ENABLE_MYST - -class MystBitmap; -class MohawkEngine_Myst; - -enum RectState { - kRectEnabled, - kRectDisabled, - kRectUnreachable -}; - -class MystGraphics : public GraphicsManager { -public: - MystGraphics(MohawkEngine_Myst*); - ~MystGraphics(); - - void loadExternalPictureFile(uint16 stack); - void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest); - void copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest); - void copyImageToScreen(uint16 image, Common::Rect dest); - void copyImageToBackBuffer(uint16 image, Common::Rect dest); - void copyBackBufferToScreen(Common::Rect r); - void runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay); - void drawRect(Common::Rect rect, RectState state); - void drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color); - void enableDrawingTimeSimulation(bool enable); - void fadeToBlack(); - void fadeFromBlack(); - -protected: - MohawkSurface *decodeImage(uint16 id); - MohawkEngine *getVM() { return (MohawkEngine *)_vm; } - void simulatePreviousDrawDelay(const Common::Rect &dest); - void copyBackBufferToScreenWithSaturation(int16 saturation); - -private: - MohawkEngine_Myst *_vm; - MystBitmap *_bmpDecoder; - Graphics::PictDecoder *_pictDecoder; - Graphics::JPEG *_jpegDecoder; - - struct PictureFile { - uint32 pictureCount; - struct PictureEntry { - uint32 offset; - uint32 size; - uint16 id; - uint16 type; - uint16 width; - uint16 height; - } *entries; - - Common::File picFile; - } _pictureFile; - - Graphics::Surface *_backBuffer; - Graphics::PixelFormat _pixelFormat; - Common::Rect _viewport; - - int _enableDrawingTimeSimulation; - uint32 _nextAllowedDrawTime; - static const uint _constantDrawDelay = 10; // ms - static const uint _proportionalDrawDelay = 500; // pixels per ms -}; - -#endif // ENABLE_MYST - -#ifdef ENABLE_RIVEN - -class MohawkEngine_Riven; - -class RivenGraphics : public GraphicsManager { -public: - RivenGraphics(MohawkEngine_Riven *vm); - ~RivenGraphics(); - - void copyImageToScreen(uint16, uint32, uint32, uint32, uint32); - void updateScreen(Common::Rect updateRect = Common::Rect(0, 0, 608, 392)); - bool _updatesEnabled; - Common::Array<uint16> _activatedPLSTs; - void drawPLST(uint16 x); - void drawRect(Common::Rect rect, bool active); - void drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect); - void drawExtrasImage(uint16 id, Common::Rect dstRect); - - // Water Effect - void scheduleWaterEffect(uint16); - void clearWaterEffects(); - bool runScheduledWaterEffects(); - - // Transitions - void scheduleTransition(uint16 id, Common::Rect rect = Common::Rect(0, 0, 608, 392)); - void runScheduledTransition(); - void fadeToBlack(); - void setTransitionSpeed(uint32 speed) { _transitionSpeed = speed; } - - // Inventory - void showInventory(); - void hideInventory(); - - // Credits - void beginCredits(); - void updateCredits(); - uint getCurCreditsImage() { return _creditsImage; } - -protected: - MohawkSurface *decodeImage(uint16 id); - MohawkEngine *getVM() { return (MohawkEngine *)_vm; } - -private: - MohawkEngine_Riven *_vm; - MohawkBitmap *_bitmapDecoder; - - // Water Effects - struct SFXERecord { - // Record values - uint16 frameCount; - Common::Rect rect; - uint16 speed; - Common::Array<Common::SeekableReadStream *> frameScripts; - - // Cur frame - uint16 curFrame; - uint32 lastFrameTime; - }; - Common::Array<SFXERecord> _waterEffects; - - // Transitions - int16 _scheduledTransition; - Common::Rect _transitionRect; - uint32 _transitionSpeed; - - // Inventory - void clearInventoryArea(); - void drawInventoryImage(uint16 id, const Common::Rect *rect); - bool _inventoryDrawn; - - // Screen Related - Graphics::Surface *_mainScreen; - bool _dirtyScreen; - Graphics::PixelFormat _pixelFormat; - void clearMainScreen(); - - // Credits - uint _creditsImage, _creditsPos; -}; - -#endif // ENABLE_RIVEN - -class LBGraphics : public GraphicsManager { -public: - LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height); - ~LBGraphics(); - - void setPalette(uint16 id); - void copyOffsetAnimImageToScreen(uint16 image, int left = 0, int top = 0); - bool imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y); - -protected: - MohawkSurface *decodeImage(uint16 id); - MohawkEngine *getVM() { return (MohawkEngine *)_vm; } - -private: - MohawkBitmap *_bmpDecoder; - MohawkEngine_LivingBooks *_vm; -}; - -#ifdef ENABLE_CSTIME - -class MohawkEngine_CSTime; - -class CSTimeGraphics : public GraphicsManager { -public: - CSTimeGraphics(MohawkEngine_CSTime *vm); - ~CSTimeGraphics(); - - void drawRect(Common::Rect rect, byte color); - -protected: - MohawkSurface *decodeImage(uint16 id); - Common::Array<MohawkSurface *> decodeImages(uint16 id); - MohawkEngine *getVM() { return (MohawkEngine *)_vm; } - -private: - MohawkBitmap *_bmpDecoder; - MohawkEngine_CSTime *_vm; -}; - -#endif - } // End of namespace Mohawk #endif diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 23ab0acfb1..91d6a8cd30 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -25,7 +25,7 @@ #include "mohawk/mohawk.h" #include "mohawk/console.h" -#include "mohawk/graphics.h" +#include "mohawk/livingbooks_graphics.h" #include "mohawk/sound.h" #include "common/config-file.h" diff --git a/engines/mohawk/livingbooks_graphics.cpp b/engines/mohawk/livingbooks_graphics.cpp new file mode 100644 index 0000000000..fb764fa15b --- /dev/null +++ b/engines/mohawk/livingbooks_graphics.cpp @@ -0,0 +1,102 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mohawk/resource.h" +#include "mohawk/livingbooks.h" +#include "mohawk/livingbooks_graphics.h" + +#include "common/substream.h" +#include "common/system.h" +#include "engines/util.h" +#include "graphics/palette.h" + +namespace Mohawk { + +LBGraphics::LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height) : GraphicsManager(), _vm(vm) { + _bmpDecoder = _vm->isPreMohawk() ? new LivingBooksBitmap_v1() : new MohawkBitmap(); + + initGraphics(width, height, true); +} + +LBGraphics::~LBGraphics() { + delete _bmpDecoder; +} + +MohawkSurface *LBGraphics::decodeImage(uint16 id) { + if (_vm->isPreMohawk()) + return _bmpDecoder->decodeImage(_vm->wrapStreamEndian(ID_BMAP, id)); + + return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id)); +} + +void LBGraphics::copyOffsetAnimImageToScreen(uint16 image, int left, int top) { + MohawkSurface *mhkSurface = findImage(image); + + left -= mhkSurface->getOffsetX(); + top -= mhkSurface->getOffsetY(); + + GraphicsManager::copyAnimImageToScreen(image, left, top); +} + +bool LBGraphics::imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y) { + MohawkSurface *mhkSurface = findImage(image); + + if (useOffsets) { + x += mhkSurface->getOffsetX(); + y += mhkSurface->getOffsetY(); + } + + if (x < 0 || y < 0) + return true; + + Graphics::Surface *surface = mhkSurface->getSurface(); + if (x >= surface->w || y >= surface->h) + return true; + + return *(byte *)surface->getBasePtr(x, y) == 0; +} + +void LBGraphics::setPalette(uint16 id) { + // Old Living Books games use the old CTBL-style palette format while newer + // games use the better tPAL format which can store partial palettes. + if (_vm->isPreMohawk()) { + Common::SeekableSubReadStreamEndian *ctblStream = _vm->wrapStreamEndian(ID_CTBL, id); + uint16 colorCount = ctblStream->readUint16(); + byte *palette = new byte[colorCount * 3]; + + for (uint16 i = 0; i < colorCount; i++) { + palette[i * 3 + 0] = ctblStream->readByte(); + palette[i * 3 + 1] = ctblStream->readByte(); + palette[i * 3 + 2] = ctblStream->readByte(); + ctblStream->readByte(); + } + + delete ctblStream; + + _vm->_system->getPaletteManager()->setPalette(palette, 0, colorCount); + delete[] palette; + } else { + GraphicsManager::setPalette(id); + } +} + +} // End of namespace Mohawk diff --git a/engines/mohawk/livingbooks_graphics.h b/engines/mohawk/livingbooks_graphics.h new file mode 100644 index 0000000000..3e2609750a --- /dev/null +++ b/engines/mohawk/livingbooks_graphics.h @@ -0,0 +1,52 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MOHAWK_LIVINGBOOKS_GRAPHICS_H +#define MOHAWK_LIVINGBOOKS_GRAPHICS_H + +#include "mohawk/graphics.h" + +namespace Mohawk { + +class MohawkEngine_LivingBooks; + +class LBGraphics : public GraphicsManager { +public: + LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height); + ~LBGraphics(); + + void setPalette(uint16 id); + void copyOffsetAnimImageToScreen(uint16 image, int left = 0, int top = 0); + bool imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y); + +protected: + MohawkSurface *decodeImage(uint16 id); + MohawkEngine *getVM() { return (MohawkEngine *)_vm; } + +private: + MohawkBitmap *_bmpDecoder; + MohawkEngine_LivingBooks *_vm; +}; + +} // End of namespace Mohawk + +#endif diff --git a/engines/mohawk/module.mk b/engines/mohawk/module.mk index 882f3966b2..83e541e3e4 100644 --- a/engines/mohawk/module.mk +++ b/engines/mohawk/module.mk @@ -10,6 +10,7 @@ MODULE_OBJS = \ installer_archive.o \ livingbooks.o \ livingbooks_code.o \ + livingbooks_graphics.o \ livingbooks_lbx.o \ mohawk.o \ resource.o \ @@ -22,6 +23,7 @@ MODULE_OBJS += \ cstime.o \ cstime_cases.o \ cstime_game.o \ + cstime_graphics.o \ cstime_ui.o \ cstime_view.o endif @@ -30,6 +32,7 @@ ifdef ENABLE_MYST MODULE_OBJS += \ myst.o \ myst_areas.o \ + myst_graphics.o \ myst_scripts.o \ myst_state.o \ resource_cache.o \ @@ -51,6 +54,7 @@ ifdef ENABLE_RIVEN MODULE_OBJS += \ riven.o \ riven_external.o \ + riven_graphics.o \ riven_saveload.o \ riven_scripts.o \ riven_vars.o diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index eeb4594f3c..c22b30ad4d 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -27,9 +27,9 @@ #include "common/textconsole.h" #include "mohawk/cursors.h" -#include "mohawk/graphics.h" #include "mohawk/myst.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_scripts.h" #include "mohawk/myst_state.h" #include "mohawk/dialogs.h" diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp index 294fcea2f1..a54b67bef4 100644 --- a/engines/mohawk/myst_areas.cpp +++ b/engines/mohawk/myst_areas.cpp @@ -20,8 +20,8 @@ * */ -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_scripts.h" #include "mohawk/sound.h" #include "mohawk/video.h" @@ -134,7 +134,7 @@ const Common::String MystResourceType5::describe() { desc += " ops:"; for (uint i = 0; i < _script->size(); i++) - desc += " " + _vm->_scriptParser->getOpcodeDesc(_script->operator[](i).opcode); + desc += " " + _vm->_scriptParser->getOpcodeDesc((*_script)[i].opcode); } return desc; diff --git a/engines/mohawk/myst_areas.h b/engines/mohawk/myst_areas.h index 297a7cc92b..62af5ec4cf 100644 --- a/engines/mohawk/myst_areas.h +++ b/engines/mohawk/myst_areas.h @@ -20,11 +20,13 @@ * */ +#ifndef MYST_AREAS_H +#define MYST_AREAS_H + #include "mohawk/myst.h" #include "mohawk/video.h" -#ifndef MYST_AREAS_H -#define MYST_AREAS_H +#include "common/rect.h" namespace Mohawk { diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp new file mode 100644 index 0000000000..151390580f --- /dev/null +++ b/engines/mohawk/myst_graphics.cpp @@ -0,0 +1,493 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mohawk/myst.h" +#include "mohawk/myst_graphics.h" +#include "mohawk/resource.h" + +#include "common/substream.h" +#include "common/system.h" +#include "common/textconsole.h" +#include "engines/util.h" +#include "graphics/jpeg.h" +#include "graphics/pict.h" + +namespace Mohawk { + +MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) { + _bmpDecoder = new MystBitmap(); + + _viewport = Common::Rect(544, 332); + + // The original version of Myst could run in 8bpp color too. + // However, it dithered videos to 8bpp and they looked considerably + // worse (than they already did :P). So we're not even going to + // support 8bpp mode in Myst (Myst ME required >8bpp anyway). + initGraphics(_viewport.width(), _viewport.height(), true, NULL); // What an odd screen size! + + _pixelFormat = _vm->_system->getScreenFormat(); + + if (_pixelFormat.bytesPerPixel == 1) + error("Myst requires greater than 256 colors to run"); + + if (_vm->getFeatures() & GF_ME) { + _jpegDecoder = new Graphics::JPEG(); + _pictDecoder = new Graphics::PictDecoder(_pixelFormat); + } else { + _jpegDecoder = NULL; + _pictDecoder = NULL; + } + + _pictureFile.entries = NULL; + + // Initialize our buffer + _backBuffer = new Graphics::Surface(); + _backBuffer->create(_vm->_system->getWidth(), _vm->_system->getHeight(), _pixelFormat); + + _nextAllowedDrawTime = _vm->_system->getMillis(); + _enableDrawingTimeSimulation = 0; +} + +MystGraphics::~MystGraphics() { + delete _bmpDecoder; + delete _jpegDecoder; + delete _pictDecoder; + delete[] _pictureFile.entries; + + _backBuffer->free(); + delete _backBuffer; +} + +static const char *s_picFileNames[] = { + "CHpics", + "", + "", + "DUpics", + "INpics", + "", + "MEpics", + "MYpics", + "SEpics", + "", + "", + "STpics" +}; + +void MystGraphics::loadExternalPictureFile(uint16 stack) { + if (_vm->getPlatform() != Common::kPlatformMacintosh) + return; + + if (_pictureFile.picFile.isOpen()) + _pictureFile.picFile.close(); + delete[] _pictureFile.entries; + + if (!scumm_stricmp(s_picFileNames[stack], "")) + return; + + if (!_pictureFile.picFile.open(s_picFileNames[stack])) + error ("Could not open external picture file \'%s\'", s_picFileNames[stack]); + + _pictureFile.pictureCount = _pictureFile.picFile.readUint32BE(); + _pictureFile.entries = new PictureFile::PictureEntry[_pictureFile.pictureCount]; + + for (uint32 i = 0; i < _pictureFile.pictureCount; i++) { + _pictureFile.entries[i].offset = _pictureFile.picFile.readUint32BE(); + _pictureFile.entries[i].size = _pictureFile.picFile.readUint32BE(); + _pictureFile.entries[i].id = _pictureFile.picFile.readUint16BE(); + _pictureFile.entries[i].type = _pictureFile.picFile.readUint16BE(); + _pictureFile.entries[i].width = _pictureFile.picFile.readUint16BE(); + _pictureFile.entries[i].height = _pictureFile.picFile.readUint16BE(); + } +} + +MohawkSurface *MystGraphics::decodeImage(uint16 id) { + MohawkSurface *mhkSurface = 0; + + // Myst ME uses JPEG/PICT images instead of compressed Windows Bitmaps for room images, + // though there are a few weird ones that use that format. For further nonsense with images, + // the Macintosh version stores images in external "picture files." We check them before + // going to check for a PICT resource. + if (_vm->getFeatures() & GF_ME && _vm->getPlatform() == Common::kPlatformMacintosh && _pictureFile.picFile.isOpen()) { + for (uint32 i = 0; i < _pictureFile.pictureCount; i++) + if (_pictureFile.entries[i].id == id) { + if (_pictureFile.entries[i].type == 0) { + Common::SeekableReadStream *stream = new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size); + + if (!_jpegDecoder->read(stream)) + error("Could not decode Myst ME Mac JPEG"); + + mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat)); + delete stream; + } else if (_pictureFile.entries[i].type == 1) { + mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size))); + } else + error ("Unknown Picture File type %d", _pictureFile.entries[i].type); + break; + } + } + + // We're not using the external Mac files, so it's time to delve into the main Mohawk + // archives. However, we still don't know if it's a PICT or WDIB resource. If it's Myst + // ME it's most likely a PICT, and if it's original it's definitely a WDIB. However, + // Myst ME throws us another curve ball in that PICT resources can contain WDIB's instead + // of PICT's. + if (!mhkSurface) { + bool isPict = false; + Common::SeekableReadStream *dataStream = NULL; + + if (_vm->getFeatures() & GF_ME && _vm->hasResource(ID_PICT, id)) { + // The PICT resource exists. However, it could still contain a MystBitmap + // instead of a PICT image... + dataStream = _vm->getResource(ID_PICT, id); + } else // No PICT, so the WDIB must exist. Let's go grab it. + dataStream = _vm->getResource(ID_WDIB, id); + + if (_vm->getFeatures() & GF_ME) { + // Here we detect whether it's really a PICT or a WDIB. Since a MystBitmap + // would be compressed, there's no way to detect for the BM without a hack. + // So, we search for the PICT version opcode for detection. + dataStream->seek(512 + 10); // 512 byte pict header + isPict = (dataStream->readUint32BE() == 0x001102FF); + dataStream->seek(0); + } + + if (isPict) + mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(dataStream)); + else { + mhkSurface = _bmpDecoder->decodeImage(dataStream); + mhkSurface->convertToTrueColor(); + } + } + + assert(mhkSurface); + return mhkSurface; +} + +void MystGraphics::copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest) { + Graphics::Surface *surface = findImage(image)->getSurface(); + + // Make sure the image is bottom aligned in the dest rect + dest.top = dest.bottom - MIN<int>(surface->h, dest.height()); + + // Convert from bitmap coordinates to surface coordinates + uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height())); + + // Do not draw the top pixels if the image is too tall + if (dest.height() > _viewport.height()) + top += dest.height() - _viewport.height(); + + // Clip the destination rect to the screen + if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight()) + dest.debugPrint(4, "Clipping destination rect to the screen"); + dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth()); + dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight()); + + uint16 width = MIN<int>(surface->w, dest.width()); + uint16 height = MIN<int>(surface->h, dest.height()); + + // Clamp Width and Height to within src surface dimensions + if (src.left + width > surface->w) + width = surface->w - src.left; + if (src.top + height > surface->h) + height = surface->h - src.top; + + debug(3, "MystGraphics::copyImageSectionToScreen()"); + debug(3, "\tImage: %d", image); + debug(3, "\tsrc.left: %d", src.left); + debug(3, "\tsrc.top: %d", src.top); + debug(3, "\tdest.left: %d", dest.left); + debug(3, "\tdest.top: %d", dest.top); + debug(3, "\twidth: %d", width); + debug(3, "\theight: %d", height); + + simulatePreviousDrawDelay(dest); + + _vm->_system->copyRectToScreen((byte *)surface->getBasePtr(src.left, top), surface->pitch, dest.left, dest.top, width, height); +} + +void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest) { + Graphics::Surface *surface = findImage(image)->getSurface(); + + // Make sure the image is bottom aligned in the dest rect + dest.top = dest.bottom - MIN<int>(surface->h, dest.height()); + + // Convert from bitmap coordinates to surface coordinates + uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height())); + + // Do not draw the top pixels if the image is too tall + if (dest.height() > _viewport.height()) { + top += dest.height() - _viewport.height(); + } + + // Clip the destination rect to the screen + if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight()) + dest.debugPrint(4, "Clipping destination rect to the screen"); + dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth()); + dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight()); + + uint16 width = MIN<int>(surface->w, dest.width()); + uint16 height = MIN<int>(surface->h, dest.height()); + + // Clamp Width and Height to within src surface dimensions + if (src.left + width > surface->w) + width = surface->w - src.left; + if (src.top + height > surface->h) + height = surface->h - src.top; + + debug(3, "MystGraphics::copyImageSectionToBackBuffer()"); + debug(3, "\tImage: %d", image); + debug(3, "\tsrc.left: %d", src.left); + debug(3, "\tsrc.top: %d", src.top); + debug(3, "\tdest.left: %d", dest.left); + debug(3, "\tdest.top: %d", dest.top); + debug(3, "\twidth: %d", width); + debug(3, "\theight: %d", height); + + for (uint16 i = 0; i < height; i++) + memcpy(_backBuffer->getBasePtr(dest.left, i + dest.top), surface->getBasePtr(src.left, top + i), width * surface->format.bytesPerPixel); +} + +void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) { + copyImageSectionToScreen(image, Common::Rect(544, 333), dest); +} + +void MystGraphics::copyImageToBackBuffer(uint16 image, Common::Rect dest) { + copyImageSectionToBackBuffer(image, Common::Rect(544, 333), dest); +} + +void MystGraphics::copyBackBufferToScreen(Common::Rect r) { + r.clip(_viewport); + + simulatePreviousDrawDelay(r); + + _vm->_system->copyRectToScreen((byte *)_backBuffer->getBasePtr(r.left, r.top), _backBuffer->pitch, r.left, r.top, r.width(), r.height()); +} + +void MystGraphics::runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay) { + + // Do not artificially delay during transitions + int oldEnableDrawingTimeSimulation = _enableDrawingTimeSimulation; + _enableDrawingTimeSimulation = 0; + + switch (type) { + case 0: { + debugC(kDebugScript, "Left to Right"); + + uint16 step = (rect.right - rect.left) / steps; + Common::Rect area = rect; + for (uint i = 0; i < steps; i++) { + area.left = rect.left + step * i; + area.right = area.left + step; + + _vm->_system->delayMillis(delay); + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + if (area.right < rect.right) { + area.left = area.right; + area.right = rect.right; + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + } + break; + case 1: { + debugC(kDebugScript, "Right to Left"); + + uint16 step = (rect.right - rect.left) / steps; + Common::Rect area = rect; + for (uint i = 0; i < steps; i++) { + area.right = rect.right - step * i; + area.left = area.right - step; + + _vm->_system->delayMillis(delay); + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + if (area.left > rect.left) { + area.right = area.left; + area.left = rect.left; + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + } + break; + case 5: { + debugC(kDebugScript, "Top to Bottom"); + + uint16 step = (rect.bottom - rect.top) / steps; + Common::Rect area = rect; + for (uint i = 0; i < steps; i++) { + area.top = rect.top + step * i; + area.bottom = area.top + step; + + _vm->_system->delayMillis(delay); + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + if (area.bottom < rect.bottom) { + area.top = area.bottom; + area.bottom = rect.bottom; + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + } + break; + case 6: { + debugC(kDebugScript, "Bottom to Top"); + + uint16 step = (rect.bottom - rect.top) / steps; + Common::Rect area = rect; + for (uint i = 0; i < steps; i++) { + area.bottom = rect.bottom - step * i; + area.top = area.bottom - step; + + _vm->_system->delayMillis(delay); + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + if (area.top > rect.top) { + area.bottom = area.top; + area.top = rect.top; + + copyBackBufferToScreen(area); + _vm->_system->updateScreen(); + } + } + break; + default: + warning("Unknown Update Direction"); + + //TODO: Replace minimal implementation + copyBackBufferToScreen(rect); + _vm->_system->updateScreen(); + break; + } + + _enableDrawingTimeSimulation = oldEnableDrawingTimeSimulation; +} + +void MystGraphics::drawRect(Common::Rect rect, RectState state) { + rect.clip(_viewport); + + // Useful with debugging. Shows where hotspots are on the screen and whether or not they're active. + if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0) + return; + + Graphics::Surface *screen = _vm->_system->lockScreen(); + + if (state == kRectEnabled) + screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0)); + else if (state == kRectUnreachable) + screen->frameRect(rect, _pixelFormat.RGBToColor(0, 0, 255)); + else + screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0)); + + _vm->_system->unlockScreen(); +} + +void MystGraphics::drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color) { + _backBuffer->drawLine(p1.x, p1.y, p2.x, p2.y, color); +} + +void MystGraphics::enableDrawingTimeSimulation(bool enable) { + if (enable) + _enableDrawingTimeSimulation++; + else + _enableDrawingTimeSimulation--; + + if (_enableDrawingTimeSimulation < 0) + _enableDrawingTimeSimulation = 0; +} + +void MystGraphics::simulatePreviousDrawDelay(const Common::Rect &dest) { + uint32 time = 0; + + if (_enableDrawingTimeSimulation) { + time = _vm->_system->getMillis(); + + // Do not draw anything new too quickly after the previous draw call + // so that images stay at least a little while on screen + // This is enabled only for scripted draw calls + if (time < _nextAllowedDrawTime) + _vm->_system->delayMillis(_nextAllowedDrawTime - time); + } + + // Next draw call allowed at DELAY + AERA * COEFF milliseconds from now + time = _vm->_system->getMillis(); + _nextAllowedDrawTime = time + _constantDrawDelay + dest.height() * dest.width() / _proportionalDrawDelay; +} + +void MystGraphics::copyBackBufferToScreenWithSaturation(int16 saturation) { + Graphics::Surface *screen = _vm->_system->lockScreen(); + + for (uint16 y = 0; y < _viewport.height(); y++) + for (uint16 x = 0; x < _viewport.width(); x++) { + uint32 color; + uint8 r, g, b; + + if (_pixelFormat.bytesPerPixel == 2) + color = *(const uint16 *)_backBuffer->getBasePtr(x, y); + else + color = *(const uint32 *)_backBuffer->getBasePtr(x, y); + + _pixelFormat.colorToRGB(color, r, g, b); + + r = CLIP<int16>((int16)r - saturation, 0, 255); + g = CLIP<int16>((int16)g - saturation, 0, 255); + b = CLIP<int16>((int16)b - saturation, 0, 255); + + color = _pixelFormat.RGBToColor(r, g, b); + + if (_pixelFormat.bytesPerPixel == 2) { + uint16 *dst = (uint16 *)screen->getBasePtr(x, y); + *dst = color; + } else { + uint32 *dst = (uint32 *)screen->getBasePtr(x, y); + *dst = color; + } + } + + _vm->_system->unlockScreen(); + _vm->_system->updateScreen(); +} + +void MystGraphics::fadeToBlack() { + for (int16 i = 0; i < 256; i += 32) { + copyBackBufferToScreenWithSaturation(i); + } +} + +void MystGraphics::fadeFromBlack() { + for (int16 i = 256; i >= 0; i -= 32) { + copyBackBufferToScreenWithSaturation(i); + } +} + +} // End of namespace Mohawk diff --git a/engines/mohawk/myst_graphics.h b/engines/mohawk/myst_graphics.h new file mode 100644 index 0000000000..e2b02db5fc --- /dev/null +++ b/engines/mohawk/myst_graphics.h @@ -0,0 +1,102 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MOHAWK_MYST_GRAPHICS_H +#define MOHAWK_MYST_GRAPHICS_H + +#include "mohawk/graphics.h" + +#include "common/file.h" + +namespace Graphics { +class JPEG; +class PictDecoder; +} + +namespace Mohawk { + +class MystBitmap; +class MohawkEngine_Myst; + +enum RectState { + kRectEnabled, + kRectDisabled, + kRectUnreachable +}; + +class MystGraphics : public GraphicsManager { +public: + MystGraphics(MohawkEngine_Myst*); + ~MystGraphics(); + + void loadExternalPictureFile(uint16 stack); + void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest); + void copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest); + void copyImageToScreen(uint16 image, Common::Rect dest); + void copyImageToBackBuffer(uint16 image, Common::Rect dest); + void copyBackBufferToScreen(Common::Rect r); + void runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay); + void drawRect(Common::Rect rect, RectState state); + void drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color); + void enableDrawingTimeSimulation(bool enable); + void fadeToBlack(); + void fadeFromBlack(); + +protected: + MohawkSurface *decodeImage(uint16 id); + MohawkEngine *getVM() { return (MohawkEngine *)_vm; } + void simulatePreviousDrawDelay(const Common::Rect &dest); + void copyBackBufferToScreenWithSaturation(int16 saturation); + +private: + MohawkEngine_Myst *_vm; + MystBitmap *_bmpDecoder; + Graphics::PictDecoder *_pictDecoder; + Graphics::JPEG *_jpegDecoder; + + struct PictureFile { + uint32 pictureCount; + struct PictureEntry { + uint32 offset; + uint32 size; + uint16 id; + uint16 type; + uint16 width; + uint16 height; + } *entries; + + Common::File picFile; + } _pictureFile; + + Graphics::Surface *_backBuffer; + Graphics::PixelFormat _pixelFormat; + Common::Rect _viewport; + + int _enableDrawingTimeSimulation; + uint32 _nextAllowedDrawTime; + static const uint _constantDrawDelay = 10; // ms + static const uint _proportionalDrawDelay = 500; // pixels per ms +}; + +} // End of namespace Mohawk + +#endif diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index ca8e985491..107a8b03e9 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_scripts.h" #include "mohawk/sound.h" #include "mohawk/video.h" @@ -161,7 +161,7 @@ void MystScriptParser::runScript(MystScript script, MystResource *invokingResour _vm->_gfx->enableDrawingTimeSimulation(true); for (uint16 i = 0; i < script->size(); i++) { - MystScriptEntry &entry = script->operator[](i); + MystScriptEntry &entry = (*script)[i]; debugC(kDebugScript, "\tOpcode %d: %d", i, entry.opcode); if (entry.type == kMystScriptNormal) @@ -207,7 +207,7 @@ MystScript MystScriptParser::readScript(Common::SeekableReadStream *stream, Myst script->resize(opcodeCount); for (uint16 i = 0; i < opcodeCount; i++) { - MystScriptEntry &entry = script->operator[](i); + MystScriptEntry &entry = (*script)[i]; entry.type = type; // Resource ID only exists in INIT and EXIT scripts diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp index 9ca47cc92a..069281f5dc 100644 --- a/engines/mohawk/myst_stacks/channelwood.cpp +++ b/engines/mohawk/myst_stacks/channelwood.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_state.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp index ad593e3542..192e55d5e3 100644 --- a/engines/mohawk/myst_stacks/credits.cpp +++ b/engines/mohawk/myst_stacks/credits.cpp @@ -21,8 +21,8 @@ */ #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/sound.h" #include "mohawk/video.h" #include "mohawk/myst_stacks/credits.h" diff --git a/engines/mohawk/myst_stacks/demo.cpp b/engines/mohawk/myst_stacks/demo.cpp index fbad7dc384..29a12571fd 100644 --- a/engines/mohawk/myst_stacks/demo.cpp +++ b/engines/mohawk/myst_stacks/demo.cpp @@ -21,8 +21,8 @@ */ #include "mohawk/cursors.h" -#include "mohawk/graphics.h" #include "mohawk/myst.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_stacks/demo.h" #include "common/system.h" diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp index 7d3179fa24..0af386f51f 100644 --- a/engines/mohawk/myst_stacks/intro.cpp +++ b/engines/mohawk/myst_stacks/intro.cpp @@ -21,8 +21,8 @@ */ #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_state.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp index 12d9dc7e2f..79de03308c 100644 --- a/engines/mohawk/myst_stacks/mechanical.cpp +++ b/engines/mohawk/myst_stacks/mechanical.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_state.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index b3222e0322..c1ddc74c82 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_state.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/myst_stacks/preview.cpp b/engines/mohawk/myst_stacks/preview.cpp index 31e22bb8c5..0b8dcf897a 100644 --- a/engines/mohawk/myst_stacks/preview.cpp +++ b/engines/mohawk/myst_stacks/preview.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/sound.h" #include "mohawk/video.h" #include "mohawk/myst_stacks/preview.h" diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp index 794793e49c..c0bb400db1 100644 --- a/engines/mohawk/myst_stacks/slides.cpp +++ b/engines/mohawk/myst_stacks/slides.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/sound.h" #include "mohawk/video.h" #include "mohawk/myst_stacks/slides.h" diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp index 6d54d0c586..ef228e62f3 100644 --- a/engines/mohawk/myst_stacks/stoneship.cpp +++ b/engines/mohawk/myst_stacks/stoneship.cpp @@ -22,8 +22,8 @@ #include "mohawk/cursors.h" #include "mohawk/myst.h" -#include "mohawk/graphics.h" #include "mohawk/myst_areas.h" +#include "mohawk/myst_graphics.h" #include "mohawk/myst_state.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 3e2fa4f979..95a8313536 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -27,11 +27,11 @@ #include "common/system.h" #include "mohawk/cursors.h" -#include "mohawk/graphics.h" #include "mohawk/installer_archive.h" #include "mohawk/resource.h" #include "mohawk/riven.h" #include "mohawk/riven_external.h" +#include "mohawk/riven_graphics.h" #include "mohawk/riven_saveload.h" #include "mohawk/dialogs.h" #include "mohawk/sound.h" @@ -171,7 +171,7 @@ Common::Error MohawkEngine_Riven::run() { error ("Could not find saved game"); // Attempt to load the game. On failure, just send us to the main menu. - if (!_saveLoad->loadGame(savedGamesList[gameToLoad])) { + if (_saveLoad->loadGame(savedGamesList[gameToLoad]).getCode() != Common::kNoError) { changeToStack(aspit); changeToCard(1); } @@ -729,7 +729,7 @@ void MohawkEngine_Riven::runLoadDialog() { } Common::Error MohawkEngine_Riven::loadGameState(int slot) { - return _saveLoad->loadGame(_saveLoad->generateSaveGameList()[slot]) ? Common::kNoError : Common::kUnknownError; + return _saveLoad->loadGame(_saveLoad->generateSaveGameList()[slot]); } Common::Error MohawkEngine_Riven::saveGameState(int slot, const Common::String &desc) { @@ -738,7 +738,7 @@ Common::Error MohawkEngine_Riven::saveGameState(int slot, const Common::String & if ((uint)slot < saveList.size()) _saveLoad->deleteSave(saveList[slot]); - return _saveLoad->saveGame(Common::String(desc)) ? Common::kNoError : Common::kUnknownError; + return _saveLoad->saveGame(desc); } Common::String MohawkEngine_Riven::getStackName(uint16 stack) const { diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index e99a9f78fc..961d85d61a 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -130,8 +130,8 @@ public: GUI::Debugger *getDebugger(); - bool canLoadGameStateCurrently() { return true; } - bool canSaveGameStateCurrently() { return true; } + bool canLoadGameStateCurrently() { return !(getFeatures() & GF_DEMO); } + bool canSaveGameStateCurrently() { return !(getFeatures() & GF_DEMO); } Common::Error loadGameState(int slot); Common::Error saveGameState(int slot, const Common::String &desc); bool hasFeature(EngineFeature f) const; diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp index 9e1365f8da..8dfc74ebf0 100644 --- a/engines/mohawk/riven_external.cpp +++ b/engines/mohawk/riven_external.cpp @@ -21,9 +21,9 @@ */ #include "mohawk/cursors.h" -#include "mohawk/graphics.h" #include "mohawk/riven.h" #include "mohawk/riven_external.h" +#include "mohawk/riven_graphics.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/riven_graphics.cpp b/engines/mohawk/riven_graphics.cpp new file mode 100644 index 0000000000..9415e51412 --- /dev/null +++ b/engines/mohawk/riven_graphics.cpp @@ -0,0 +1,445 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mohawk/resource.h" +#include "mohawk/riven.h" +#include "mohawk/riven_graphics.h" + +#include "common/system.h" +#include "engines/util.h" + +namespace Mohawk { + +RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) : GraphicsManager(), _vm(vm) { + _bitmapDecoder = new MohawkBitmap(); + + // Give me the best you've got! + initGraphics(608, 436, true, NULL); + _pixelFormat = _vm->_system->getScreenFormat(); + + if (_pixelFormat.bytesPerPixel == 1) + error("Riven requires greater than 256 colors to run"); + + // The actual game graphics only take up the first 392 rows. The inventory + // occupies the rest of the screen and we don't use the buffer to hold that. + _mainScreen = new Graphics::Surface(); + _mainScreen->create(608, 392, _pixelFormat); + + _updatesEnabled = true; + _scheduledTransition = -1; // no transition + _dirtyScreen = false; + _inventoryDrawn = false; + + _creditsImage = 302; + _creditsPos = 0; +} + +RivenGraphics::~RivenGraphics() { + _mainScreen->free(); + delete _mainScreen; + delete _bitmapDecoder; +} + +MohawkSurface *RivenGraphics::decodeImage(uint16 id) { + MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getResource(ID_TBMP, id)); + surface->convertToTrueColor(); + return surface; +} + +void RivenGraphics::copyImageToScreen(uint16 image, uint32 left, uint32 top, uint32 right, uint32 bottom) { + Graphics::Surface *surface = findImage(image)->getSurface(); + + // Clip the width to fit on the screen. Fixes some images. + if (left + surface->w > 608) + surface->w = 608 - left; + + for (uint16 i = 0; i < surface->h; i++) + memcpy(_mainScreen->getBasePtr(left, i + top), surface->getBasePtr(0, i), surface->w * surface->format.bytesPerPixel); + + _dirtyScreen = true; +} + +void RivenGraphics::drawPLST(uint16 x) { + Common::SeekableReadStream* plst = _vm->getResource(ID_PLST, _vm->getCurCard()); + uint16 recordCount = plst->readUint16BE(); + + for (uint16 i = 0; i < recordCount; i++) { + uint16 index = plst->readUint16BE(); + uint16 id = plst->readUint16BE(); + uint16 left = plst->readUint16BE(); + uint16 top = plst->readUint16BE(); + uint16 right = plst->readUint16BE(); + uint16 bottom = plst->readUint16BE(); + + // We are also checking here to make sure we haven't drawn the image yet on screen. + // This fixes problems with drawing PLST 1 twice and some other images twice. PLST + // 1 is sometimes not called by the scripts, so some cards don't appear if we don't + // draw PLST 1 each time. This "hack" is here to catch any PLST attempting to draw + // twice. There should never be a problem with doing it this way. + if (index == x && !(Common::find(_activatedPLSTs.begin(), _activatedPLSTs.end(), x) != _activatedPLSTs.end())) { + debug(0, "Drawing image %d", id); + copyImageToScreen(id, left, top, right, bottom); + _activatedPLSTs.push_back(x); + break; + } + } + + delete plst; +} + +void RivenGraphics::updateScreen(Common::Rect updateRect) { + if (_updatesEnabled) { + _vm->runUpdateScreenScript(); + + if (_dirtyScreen) { + _activatedPLSTs.clear(); + + // Copy to screen if there's no transition. Otherwise transition. ;) + if (_scheduledTransition < 0) + _vm->_system->copyRectToScreen((byte *)_mainScreen->getBasePtr(updateRect.left, updateRect.top), _mainScreen->pitch, updateRect.left, updateRect.top, updateRect.width(), updateRect.height()); + else + runScheduledTransition(); + + // Finally, update the screen. + _vm->_system->updateScreen(); + _dirtyScreen = false; + } + } +} + +void RivenGraphics::scheduleWaterEffect(uint16 sfxeID) { + Common::SeekableReadStream *sfxeStream = _vm->getResource(ID_SFXE, sfxeID); + + if (sfxeStream->readUint16BE() != 'SL') + error ("Unknown sfxe tag"); + + // Read in header info + SFXERecord sfxeRecord; + sfxeRecord.frameCount = sfxeStream->readUint16BE(); + uint32 offsetTablePosition = sfxeStream->readUint32BE(); + sfxeRecord.rect.left = sfxeStream->readUint16BE(); + sfxeRecord.rect.top = sfxeStream->readUint16BE(); + sfxeRecord.rect.right = sfxeStream->readUint16BE(); + sfxeRecord.rect.bottom = sfxeStream->readUint16BE(); + sfxeRecord.speed = sfxeStream->readUint16BE(); + // Skip the rest of the fields... + + // Read in offsets + sfxeStream->seek(offsetTablePosition); + uint32 *frameOffsets = new uint32[sfxeRecord.frameCount]; + for (uint16 i = 0; i < sfxeRecord.frameCount; i++) + frameOffsets[i] = sfxeStream->readUint32BE(); + sfxeStream->seek(frameOffsets[0]); + + // Read in the scripts + for (uint16 i = 0; i < sfxeRecord.frameCount; i++) + sfxeRecord.frameScripts.push_back(sfxeStream->readStream((i == sfxeRecord.frameCount - 1) ? sfxeStream->size() - frameOffsets[i] : frameOffsets[i + 1] - frameOffsets[i])); + + // Set it to the first frame + sfxeRecord.curFrame = 0; + sfxeRecord.lastFrameTime = 0; + + delete[] frameOffsets; + delete sfxeStream; + _waterEffects.push_back(sfxeRecord); +} + +void RivenGraphics::clearWaterEffects() { + _waterEffects.clear(); +} + +bool RivenGraphics::runScheduledWaterEffects() { + // Don't run the effect if it's disabled + if (_vm->_vars["waterenabled"] == 0) + return false; + + Graphics::Surface *screen = NULL; + + for (uint16 i = 0; i < _waterEffects.size(); i++) { + if (_vm->_system->getMillis() > _waterEffects[i].lastFrameTime + 1000 / _waterEffects[i].speed) { + // Lock the screen! + if (!screen) + screen = _vm->_system->lockScreen(); + + // Make sure the script is at the starting point + Common::SeekableReadStream *script = _waterEffects[i].frameScripts[_waterEffects[i].curFrame]; + if (script->pos() != 0) + script->seek(0); + + // Run script + uint16 curRow = 0; + for (uint16 op = script->readUint16BE(); op != 4; op = script->readUint16BE()) { + if (op == 1) { // Increment Row + curRow++; + } else if (op == 3) { // Copy Pixels + uint16 dstLeft = script->readUint16BE(); + uint16 srcLeft = script->readUint16BE(); + uint16 srcTop = script->readUint16BE(); + uint16 rowWidth = script->readUint16BE(); + memcpy ((byte *)screen->getBasePtr(dstLeft, curRow + _waterEffects[i].rect.top), (byte *)_mainScreen->getBasePtr(srcLeft, srcTop), rowWidth * _pixelFormat.bytesPerPixel); + } else if (op != 4) { // End of Script + error ("Unknown SFXE opcode %d", op); + } + } + + // Increment frame + _waterEffects[i].curFrame++; + if (_waterEffects[i].curFrame == _waterEffects[i].frameCount) + _waterEffects[i].curFrame = 0; + + // Set the new time + _waterEffects[i].lastFrameTime = _vm->_system->getMillis(); + } + } + + // Unlock the screen if it has been locked and return true to update the screen + if (screen) { + _vm->_system->unlockScreen(); + return true; + } + + return false; +} + +void RivenGraphics::scheduleTransition(uint16 id, Common::Rect rect) { + _scheduledTransition = id; + _transitionRect = rect; +} + +void RivenGraphics::runScheduledTransition() { + if (_scheduledTransition < 0) // No transition is scheduled + return; + + // TODO: There's a lot to be done here... + + // Note: Transitions 0-11 are actual transitions, but none are used in-game. + // There's no point in implementing them if they're not used. These extra + // transitions were found by hacking scripts. + + switch (_scheduledTransition) { + case 0: // Swipe Left + case 1: // Swipe Right + case 2: // Swipe Up + case 3: // Swipe Down + case 12: // Pan Left + case 13: // Pan Right + case 14: // Pan Up + case 15: // Pan Down + case 16: // Dissolve + case 17: // Dissolve (tspit CARD 155) + break; + default: + if (_scheduledTransition >= 4 && _scheduledTransition <= 11) + error("Found unused transition %d", _scheduledTransition); + else + error("Found unknown transition %d", _scheduledTransition); + } + + // For now, just copy the image to screen without doing any transition. + _vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h); + _vm->_system->updateScreen(); + + _scheduledTransition = -1; // Clear scheduled transition +} + +void RivenGraphics::clearMainScreen() { + _mainScreen->fillRect(Common::Rect(0, 0, 608, 392), _pixelFormat.RGBToColor(0, 0, 0)); +} + +void RivenGraphics::fadeToBlack() { + // The transition speed is forced to best here + setTransitionSpeed(kRivenTransitionSpeedBest); + scheduleTransition(16); + clearMainScreen(); + runScheduledTransition(); +} + +void RivenGraphics::showInventory() { + // Don't redraw the inventory + if (_inventoryDrawn) + return; + + // Clear the inventory area + clearInventoryArea(); + + // Draw the demo's exit button + if (_vm->getFeatures() & GF_DEMO) { + // extras.mhk tBMP 101 contains "EXIT" instead of Atrus' journal in the demo! + // The demo's extras.mhk contains all the other inventory/marble/credits image + // but has hacked tBMP 101 with "EXIT". *sigh* + drawInventoryImage(101, g_demoExitRect); + } else { + // We don't want to show the inventory on setup screens or in other journals. + if (_vm->getCurStack() == aspit) + return; + + // There are three books and three vars. We have three different + // combinations. At the start you have just Atrus' journal. Later, + // you get Catherine's journal and the trap book. Near the end, + // you lose the trap book and have just the two journals. + + bool hasCathBook = _vm->_vars["acathbook"] != 0; + bool hasTrapBook = _vm->_vars["atrapbook"] != 0; + + if (!hasCathBook) { + drawInventoryImage(101, g_atrusJournalRect1); + } else if (!hasTrapBook) { + drawInventoryImage(101, g_atrusJournalRect2); + drawInventoryImage(102, g_cathJournalRect2); + } else { + drawInventoryImage(101, g_atrusJournalRect3); + drawInventoryImage(102, g_cathJournalRect3); + drawInventoryImage(100, g_trapBookRect3); + } + } + + _vm->_system->updateScreen(); + _inventoryDrawn = true; +} + +void RivenGraphics::hideInventory() { + // Don't hide the inventory twice + if (!_inventoryDrawn) + return; + + // Clear the area + clearInventoryArea(); + + _inventoryDrawn = false; +} + +void RivenGraphics::clearInventoryArea() { + // Clear the inventory area + static const Common::Rect inventoryRect = Common::Rect(0, 392, 608, 436); + + // Lock the screen + Graphics::Surface *screen = _vm->_system->lockScreen(); + + // Fill the inventory area with black + screen->fillRect(inventoryRect, _pixelFormat.RGBToColor(0, 0, 0)); + + _vm->_system->unlockScreen(); +} + +void RivenGraphics::drawInventoryImage(uint16 id, const Common::Rect *rect) { + MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id)); + mhkSurface->convertToTrueColor(); + Graphics::Surface *surface = mhkSurface->getSurface(); + + _vm->_system->copyRectToScreen((byte *)surface->pixels, surface->pitch, rect->left, rect->top, surface->w, surface->h); + + delete mhkSurface; +} + +void RivenGraphics::drawRect(Common::Rect rect, bool active) { + // Useful with debugging. Shows where hotspots are on the screen and whether or not they're active. + Graphics::Surface *screen = _vm->_system->lockScreen(); + + if (active) + screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0)); + else + screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0)); + + _vm->_system->unlockScreen(); +} + +void RivenGraphics::drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect) { + // Draw tBMP id from srcRect to dstRect + Graphics::Surface *surface = findImage(id)->getSurface(); + + assert(srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height()); + + for (uint16 i = 0; i < srcRect.height(); i++) + memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(srcRect.left, i + srcRect.top), srcRect.width() * surface->format.bytesPerPixel); + + _dirtyScreen = true; +} + +void RivenGraphics::drawExtrasImage(uint16 id, Common::Rect dstRect) { + MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id)); + mhkSurface->convertToTrueColor(); + Graphics::Surface *surface = mhkSurface->getSurface(); + + assert(dstRect.width() == surface->w); + + for (uint16 i = 0; i < surface->h; i++) + memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(0, i), surface->pitch); + + delete mhkSurface; + _dirtyScreen = true; +} + +void RivenGraphics::beginCredits() { + // Clear the old cache + clearCache(); + + // Now cache all the credits images + for (uint16 i = 302; i <= 320; i++) { + MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, i)); + surface->convertToTrueColor(); + addImageToCache(i, surface); + } + + // And clear our screen too + clearMainScreen(); +} + +void RivenGraphics::updateCredits() { + if ((_creditsImage == 303 || _creditsImage == 304) && _creditsPos == 0) + fadeToBlack(); + + if (_creditsImage < 304) { + // For the first two credit images, they are faded from black to the image and then out again + scheduleTransition(16); + + Graphics::Surface *frame = findImage(_creditsImage++)->getSurface(); + + for (int y = 0; y < frame->h; y++) + memcpy(_mainScreen->getBasePtr(124, y), frame->getBasePtr(0, y), frame->pitch); + + runScheduledTransition(); + } else { + // Otheriwse, we're scrolling + // Move the screen up one row + memmove(_mainScreen->pixels, _mainScreen->getBasePtr(0, 1), _mainScreen->pitch * (_mainScreen->h - 1)); + + // Only update as long as we're not before the last frame + // Otherwise, we're just moving up a row (which we already did) + if (_creditsImage <= 320) { + // Copy the next row to the bottom of the screen + Graphics::Surface *frame = findImage(_creditsImage)->getSurface(); + memcpy(_mainScreen->getBasePtr(124, _mainScreen->h - 1), frame->getBasePtr(0, _creditsPos), frame->pitch); + _creditsPos++; + + if (_creditsPos == _mainScreen->h) { + _creditsImage++; + _creditsPos = 0; + } + } + + // Now flush the new screen + _vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h); + _vm->_system->updateScreen(); + } +} + +} // End of namespace Mohawk diff --git a/engines/mohawk/riven_graphics.h b/engines/mohawk/riven_graphics.h new file mode 100644 index 0000000000..48dda28afd --- /dev/null +++ b/engines/mohawk/riven_graphics.h @@ -0,0 +1,110 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MOHAWK_RIVEN_GRAPHICS_H +#define MOHAWK_RIVEN_GRAPHICS_H + +#include "mohawk/graphics.h" + +namespace Mohawk { + +class MohawkEngine_Riven; + +class RivenGraphics : public GraphicsManager { +public: + RivenGraphics(MohawkEngine_Riven *vm); + ~RivenGraphics(); + + void copyImageToScreen(uint16, uint32, uint32, uint32, uint32); + void updateScreen(Common::Rect updateRect = Common::Rect(0, 0, 608, 392)); + bool _updatesEnabled; + Common::Array<uint16> _activatedPLSTs; + void drawPLST(uint16 x); + void drawRect(Common::Rect rect, bool active); + void drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect); + void drawExtrasImage(uint16 id, Common::Rect dstRect); + + // Water Effect + void scheduleWaterEffect(uint16); + void clearWaterEffects(); + bool runScheduledWaterEffects(); + + // Transitions + void scheduleTransition(uint16 id, Common::Rect rect = Common::Rect(0, 0, 608, 392)); + void runScheduledTransition(); + void fadeToBlack(); + void setTransitionSpeed(uint32 speed) { _transitionSpeed = speed; } + + // Inventory + void showInventory(); + void hideInventory(); + + // Credits + void beginCredits(); + void updateCredits(); + uint getCurCreditsImage() { return _creditsImage; } + +protected: + MohawkSurface *decodeImage(uint16 id); + MohawkEngine *getVM() { return (MohawkEngine *)_vm; } + +private: + MohawkEngine_Riven *_vm; + MohawkBitmap *_bitmapDecoder; + + // Water Effects + struct SFXERecord { + // Record values + uint16 frameCount; + Common::Rect rect; + uint16 speed; + Common::Array<Common::SeekableReadStream *> frameScripts; + + // Cur frame + uint16 curFrame; + uint32 lastFrameTime; + }; + Common::Array<SFXERecord> _waterEffects; + + // Transitions + int16 _scheduledTransition; + Common::Rect _transitionRect; + uint32 _transitionSpeed; + + // Inventory + void clearInventoryArea(); + void drawInventoryImage(uint16 id, const Common::Rect *rect); + bool _inventoryDrawn; + + // Screen Related + Graphics::Surface *_mainScreen; + bool _dirtyScreen; + Graphics::PixelFormat _pixelFormat; + void clearMainScreen(); + + // Credits + uint _creditsImage, _creditsPos; +}; + +} // End of namespace Mohawk + +#endif diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp index 18c13ec12b..f5bf7782d4 100644 --- a/engines/mohawk/riven_saveload.cpp +++ b/engines/mohawk/riven_saveload.cpp @@ -88,13 +88,13 @@ static uint16 mapNewStackIDToOld(uint16 newID) { return 0; } -bool RivenSaveLoad::loadGame(Common::String filename) { +Common::Error RivenSaveLoad::loadGame(Common::String filename) { if (_vm->getFeatures() & GF_DEMO) // Don't load games in the demo - return false; + return Common::kNoError; Common::InSaveFile *loadFile = _saveFileMan->openForLoading(filename); if (!loadFile) - return false; + return Common::kReadingFailed; debug(0, "Loading game from \'%s\'", filename.c_str()); @@ -103,7 +103,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) { if (!mhk->openStream(loadFile)) { warning("Save file is not a Mohawk archive"); delete mhk; - return false; + return Common::Error(Common::kUnknownError, "Invalid save file"); } // First, let's make sure we're using a saved game file from this version of Riven by checking the VERS resource @@ -114,7 +114,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) { || (saveGameVersion == kDVDSaveGameVersion && !(_vm->getFeatures() & GF_DVD))) { warning("Incompatible saved game versions. No support for this yet"); delete mhk; - return false; + return Common::Error(Common::kUnknownError, "Incompatible save version"); } // Now, we'll read in the variable values. @@ -206,7 +206,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) { delete zips; delete mhk; - return true; + return Common::kNoError; } Common::MemoryWriteStreamDynamic *RivenSaveLoad::genVERSSection() { @@ -273,7 +273,7 @@ Common::MemoryWriteStreamDynamic *RivenSaveLoad::genZIPSSection() { return stream; } -bool RivenSaveLoad::saveGame(Common::String filename) { +Common::Error RivenSaveLoad::saveGame(Common::String filename) { // NOTE: This code is designed to only output a Mohawk archive // for a Riven saved game. It's hardcoded to do this because // (as of right now) this is the only place in the engine @@ -295,7 +295,7 @@ bool RivenSaveLoad::saveGame(Common::String filename) { Common::OutSaveFile *saveFile = _saveFileMan->openForSaving(filename); if (!saveFile) - return false; + return Common::kWritingFailed; debug (0, "Saving game to \'%s\'", filename.c_str()); @@ -418,7 +418,7 @@ bool RivenSaveLoad::saveGame(Common::String filename) { delete varsSection; delete zipsSection; - return true; + return Common::kNoError; } void RivenSaveLoad::deleteSave(Common::String saveName) { diff --git a/engines/mohawk/riven_saveload.h b/engines/mohawk/riven_saveload.h index c1b3fc639e..37b73c26c6 100644 --- a/engines/mohawk/riven_saveload.h +++ b/engines/mohawk/riven_saveload.h @@ -42,8 +42,8 @@ public: ~RivenSaveLoad(); Common::StringArray generateSaveGameList(); - bool loadGame(Common::String); - bool saveGame(Common::String); + Common::Error loadGame(Common::String); + Common::Error saveGame(Common::String); void deleteSave(Common::String); private: diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 6e3e9a34dc..352a018990 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -21,9 +21,9 @@ */ #include "mohawk/cursors.h" -#include "mohawk/graphics.h" #include "mohawk/riven.h" #include "mohawk/riven_external.h" +#include "mohawk/riven_graphics.h" #include "mohawk/riven_scripts.h" #include "mohawk/sound.h" #include "mohawk/video.h" diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h index a871f0afa0..6df4a2e523 100644 --- a/engines/mohawk/riven_scripts.h +++ b/engines/mohawk/riven_scripts.h @@ -27,8 +27,6 @@ #include "common/ptr.h" #include "common/textconsole.h" -class MohawkEngine_Riven; - #define DECLARE_OPCODE(x) void x(uint16 op, uint16 argc, uint16 *argv) namespace Mohawk { @@ -50,6 +48,7 @@ enum { kStoredOpcodeScript // This is ScummVM-only to denote the script from a storeMovieOpcode() call }; +class MohawkEngine_Riven; class RivenScript; class RivenScript { diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index 387e7af088..81761b2c6b 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -377,12 +377,12 @@ public: int16 getValue() const { assert(_accessor); - return _accessor->operator()(); + return (*_accessor)(); } void setValue(int16 value) { assert(_mutator); - _mutator->operator()(value); + (*_mutator)(value); } }; diff --git a/engines/saga/actor_path.cpp b/engines/saga/actor_path.cpp index 3e10aba6b6..0fb072b201 100644 --- a/engines/saga/actor_path.cpp +++ b/engines/saga/actor_path.cpp @@ -223,7 +223,6 @@ int Actor::fillPathArray(const Point &fromPoint, const Point &toPoint, Point &be int currentRating; Point bestPath; int pointCounter; - int startDirection; const PathDirectionData *samplePathDirection; Point nextPoint; int directionCount; @@ -235,7 +234,7 @@ int Actor::fillPathArray(const Point &fromPoint, const Point &toPoint, Point &be bestRating = quickDistance(fromPoint, toPoint, compressX); bestPath = fromPoint; - for (startDirection = 0; startDirection < 4; startDirection++) { + for (int8 startDirection = 0; startDirection < 4; startDirection++) { PathDirectionData tmp = { startDirection, fromPoint.x, fromPoint.y }; pathDirectionQueue.push_back(tmp); } diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index 5a97eb6019..71044034d7 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -104,9 +104,6 @@ SndRes::SndRes(SagaEngine *vm) : _vm(vm), _sfxContext(NULL), _voiceContext(NULL) } } -SndRes::~SndRes() { -} - void SndRes::setVoiceBank(int serial) { Common::File *file; if (_voiceSerial == serial) diff --git a/engines/saga/sndres.h b/engines/saga/sndres.h index 979c0288f6..bc38bed431 100644 --- a/engines/saga/sndres.h +++ b/engines/saga/sndres.h @@ -39,7 +39,6 @@ class SndRes { public: SndRes(SagaEngine *vm); - ~SndRes(); void playSound(uint32 resourceId, int volume, bool loop); void playVoice(uint32 resourceId); diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 63eda1c348..2047f58c8b 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -1421,6 +1421,15 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, + // King's Quest 6 - French DOS Floppy (supplied by misterhands in bug #3503425) + // SCI interpreter version ??? + {"kq6", "", { + {"resource.map", 0, "a362063318eebe7d6423b1d9dc6213e1", 8703}, + {"resource.000", 0, "f2b7f753992c56a0c7a08d6a5077c895", 7863324}, + {"resource.msg", 0, "adc2aa8adbdcc97507d44a6f492fbd77", 265194}, + AD_LISTEND}, + Common::FR_FRA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, + // King's Quest 6 - German DOS Floppy (supplied by markcoolio in bug report #2727156) // SCI interpreter version 1.001.054 {"kq6", "", { diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index aade40fd9f..312497720a 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -24,6 +24,7 @@ #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/file.h" +#include "common/macresman.h" #include "common/str.h" #include "common/savefile.h" #include "common/system.h" @@ -1080,6 +1081,14 @@ reg_t kFileIOExists(EngineState *s, int argc, reg_t *argv) { delete outFile; } + // Special case for KQ6 Mac: The game checks for two video files to see + // if they exist before it plays them. Since we support multiple naming + // schemes for resource fork files, we also need to support that here in + // case someone has a "HalfDome.bin" file, etc. + if (!exists && g_sci->getGameId() == GID_KQ6 && g_sci->getPlatform() == Common::kPlatformMacintosh && + (name == "HalfDome" || name == "Kq6Movie")) + exists = Common::MacResManager::exists(name); + debugC(kDebugLevelFile, "kFileIO(fileExists) %s -> %d", name.c_str(), exists); return make_reg(0, exists); } diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp index 02aa1d3ece..05ba7005d7 100644 --- a/engines/sci/engine/kmenu.cpp +++ b/engines/sci/engine/kmenu.cpp @@ -94,7 +94,7 @@ reg_t kDrawMenuBar(EngineState *s, int argc, reg_t *argv) { reg_t kMenuSelect(EngineState *s, int argc, reg_t *argv) { reg_t eventObject = argv[0]; - bool pauseSound = argc > 1 ? (argv[1].isNull() ? false : true) : true; + bool pauseSound = argc <= 1 || !argv[1].isNull(); return g_sci->_gfxMenu->kernelSelect(eventObject, pauseSound); } diff --git a/engines/sci/graphics/controls16.cpp b/engines/sci/graphics/controls16.cpp index ab54e468d1..7c09969717 100644 --- a/engines/sci/graphics/controls16.cpp +++ b/engines/sci/graphics/controls16.cpp @@ -297,7 +297,7 @@ void GfxControls16::kernelDrawButton(Common::Rect rect, reg_t obj, const char *t _paint16->eraseRect(rect); _paint16->frameRect(rect); rect.grow(-2); - _ports->textGreyedOutput(style & 1 ? false : true); + _ports->textGreyedOutput(!(style & SCI_CONTROLS_STYLE_ENABLED)); _text16->Box(text, false, rect, SCI_TEXT16_ALIGNMENT_CENTER, fontId); _ports->textGreyedOutput(false); rect.grow(1); diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp index daab532d0e..52a5961070 100644 --- a/engines/sci/graphics/cursor.cpp +++ b/engines/sci/graphics/cursor.cpp @@ -59,10 +59,16 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc _zoomColor = 0; _zoomMultiplier = 0; _cursorSurface = 0; + if (g_sci && g_sci->getGameId() == GID_KQ6 && g_sci->getPlatform() == Common::kPlatformWindows) _useOriginalKQ6WinCursors = ConfMan.getBool("windows_cursors"); else _useOriginalKQ6WinCursors = false; + + if (g_sci && g_sci->getGameId() == GID_SQ4 && getSciVersion() == SCI_VERSION_1_1) + _useSilverSQ4CDCursors = ConfMan.getBool("silver_cursors"); + else + _useSilverSQ4CDCursors = false; } GfxCursor::~GfxCursor() { @@ -206,6 +212,26 @@ void GfxCursor::kernelSetView(GuiResourceId viewNum, int loopNum, int celNum, Co return; } + // Use the alternate silver cursors in SQ4 CD, if requested + if (_useSilverSQ4CDCursors) { + switch(viewNum) { + case 850: + case 852: + case 854: + case 856: + celNum = 3; + break; + case 851: + case 853: + case 855: + case 999: + celNum = 2; + break; + default: + break; + } + } + if (!_cachedCursors.contains(viewNum)) _cachedCursors[viewNum] = new GfxView(_resMan, _screen, _palette, viewNum); diff --git a/engines/sci/graphics/cursor.h b/engines/sci/graphics/cursor.h index 25109b3920..ac928f50bb 100644 --- a/engines/sci/graphics/cursor.h +++ b/engines/sci/graphics/cursor.h @@ -113,13 +113,18 @@ private: bool _isVisible; - // KQ6 Windows has different black and white cursors. If this is - // true (set from the sci_originalkq6wincursors ini setting), then - // we use these, and don't scale them by 2x like the rest of the - // graphics, like SSCI did. These look very ugly, which is why - // they aren't enabled by default. + // KQ6 Windows has different black and white cursors. If this is true (set + // from the windows_cursors ini setting), then we use these and don't scale + // them by 2x like the rest of the graphics, like SSCI did. These look very + // ugly, which is why they aren't enabled by default. bool _useOriginalKQ6WinCursors; + // The CD version of SQ4 contains a complete set of silver mouse cursors. + // If this is true (set from the silver_cursors ini setting), then we use + // these instead and replace the game's gold cursors with their silver + // equivalents. + bool _useSilverSQ4CDCursors; + // Mac versions of games use a remap list to remap their cursors Common::Array<uint16> _macCursorRemap; }; diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp index 673729784f..47f34cf99d 100644 --- a/engines/sci/graphics/menu.cpp +++ b/engines/sci/graphics/menu.cpp @@ -286,7 +286,7 @@ void GfxMenu::kernelSetAttribute(uint16 menuId, uint16 itemId, uint16 attributeI switch (attributeId) { case SCI_MENU_ATTRIBUTE_ENABLED: - itemEntry->enabled = value.isNull() ? false : true; + itemEntry->enabled = !value.isNull(); break; case SCI_MENU_ATTRIBUTE_SAID: itemEntry->saidVmPtr = value; @@ -606,7 +606,7 @@ void GfxMenu::drawMenu(uint16 oldMenuId, uint16 newMenuId) { listItemEntry = *listItemIterator; if (listItemEntry->menuId == newMenuId) { if (!listItemEntry->separatorLine) { - _ports->textGreyedOutput(listItemEntry->enabled ? false : true); + _ports->textGreyedOutput(!listItemEntry->enabled); _ports->moveTo(_menuRect.left, topPos); _text16->DrawString(listItemEntry->textSplit.c_str()); _ports->moveTo(_menuRect.right - listItemEntry->textRightAlignedWidth - 5, topPos); diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp index 23177dfc7b..c951f3349d 100644 --- a/engines/sci/graphics/paint16.cpp +++ b/engines/sci/graphics/paint16.cpp @@ -513,7 +513,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) { argc--; argv++; break; case SCI_DISPLAY_SETGREYEDOUTPUT: - _ports->textGreyedOutput(argv[0].isNull() ? false : true); + _ports->textGreyedOutput(!argv[0].isNull()); argc--; argv++; break; case SCI_DISPLAY_SETFONT: diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp index e24799f6b8..7894c7109c 100644 --- a/engines/sci/graphics/text32.cpp +++ b/engines/sci/graphics/text32.cpp @@ -297,6 +297,10 @@ int16 GfxText32::Size(Common::Rect &rect, const char *text, GuiResourceId fontId int16 maxTextWidth = 0, textWidth; int16 totalHeight = 0, textHeight; + // Adjust maxWidth if we're using an upscaled font + if (_screen->fontIsUpscaled()) + maxWidth = maxWidth * _screen->getDisplayWidth() / _screen->getWidth(); + rect.top = rect.left = 0; GfxFont *font = _cache->getFont(fontId); @@ -323,6 +327,14 @@ int16 GfxText32::Size(Common::Rect &rect, const char *text, GuiResourceId fontId rect.bottom = totalHeight; rect.right = maxWidth ? maxWidth : MIN(rect.right, maxTextWidth); } + + // Adjust the width/height if we're using an upscaled font + // for the scripts + if (_screen->fontIsUpscaled()) { + rect.right = rect.right * _screen->getWidth() / _screen->getDisplayWidth(); + rect.bottom = rect.bottom * _screen->getHeight() / _screen->getDisplayHeight(); + } + return rect.right; } diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 50b3387159..77a6a40a92 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -609,7 +609,7 @@ int ResourceManager::addAppropriateSources() { if (Common::File::exists("alt.map") && Common::File::exists("resource.alt")) addSource(new VolumeResourceSource("resource.alt", addExternalMap("alt.map", 10), 10)); #endif - } else if (Common::File::exists("Data1")) { + } else if (Common::MacResManager::exists("Data1")) { // Mac SCI1.1+ file naming scheme SearchMan.listMatchingMembers(files, "Data?*"); diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 00731fc1cf..4ae55cbcba 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -194,6 +194,7 @@ Common::Error SciEngine::run() { ConfMan.registerDefault("sci_originalsaveload", "false"); ConfMan.registerDefault("native_fb01", "false"); ConfMan.registerDefault("windows_cursors", "false"); // Windows cursors for KQ6 Windows + ConfMan.registerDefault("silver_cursors", "false"); // Silver cursors for SQ4 CD _resMan = new ResourceManager(); assert(_resMan); diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 3306a76605..b8be898abc 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -39,15 +39,16 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM #ifdef ENABLE_SFX_TYPE_SELECTION // Check if the user wants synthesized or digital sound effects in SCI1.1 - // or later games - _useDigitalSFX = ConfMan.getBool("multi_midi"); + // games based on the multi_midi config setting // In SCI2 and later games, this check should always be true - there was // always only one version of each sound effect or digital music track // (e.g. the menu music in GK1 - there is a sound effect with the same // resource number, but it's totally unrelated to the menu music). - if (getSciVersion() >= SCI_VERSION_2) - _useDigitalSFX = true; + // The GK1 demo (very late SCI1.1) does the same thing + // TODO: Check the QFG4 demo + + _useDigitalSFX = (getSciVersion() >= SCI_VERSION_2 || g_sci->getGameId() == GID_GK1 || ConfMan.getBool("multi_midi")); #else // Always prefer digital sound effects _useDigitalSFX = true; @@ -93,9 +94,7 @@ void SoundCommandParser::initSoundResource(MusicEntry *newSound) { // effects map) bool checkAudioResource = getSciVersion() >= SCI_VERSION_1_1; // Hoyle 4 has garbled audio resources in place of the sound resources. - // The demo of GK1 has no alternate sound effects. - if ((g_sci->getGameId() == GID_HOYLE4) || - (g_sci->getGameId() == GID_GK1 && g_sci->isDemo())) + if (g_sci->getGameId() == GID_HOYLE4) checkAudioResource = false; if (checkAudioResource && _resMan->testResource(ResourceId(kResourceTypeAudio, newSound->resourceId))) { diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp index 8bffcab4a0..f86a4e56d5 100644 --- a/engines/scumm/gfx_towns.cpp +++ b/engines/scumm/gfx_towns.cpp @@ -271,7 +271,7 @@ void TownsScreen::setupLayer(int layer, int width, int height, int numCol, void l->enabled = true; _layers[0].onBottom = true; - _layers[1].onBottom = _layers[0].enabled ? false : true; + _layers[1].onBottom = !_layers[0].enabled; l->ready = true; } @@ -424,7 +424,7 @@ void TownsScreen::toggleLayers(int flag) { _layers[0].enabled = (flag & 1) ? true : false; _layers[0].onBottom = true; _layers[1].enabled = (flag & 2) ? true : false; - _layers[1].onBottom = _layers[0].enabled ? false : true; + _layers[1].onBottom = !_layers[0].enabled; _dirtyRects.clear(); _dirtyRects.push_back(Common::Rect(_width - 1, _height - 1)); diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 44ea3a305b..fd90015aa3 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -58,8 +58,8 @@ extern bool draw_keyboard; At the beginning the reverse engineers were happy, and did rejoice at their task, for the engine before them did shineth and was full of promise. But then they did look closer and see'th the aweful truth; - it's code was assembly and messy (rareth was its comments). And so large - were it's includes that did at first seem small; queereth also was its + its code was assembly and messy (rareth was its comments). And so large + were its includes that did at first seem small; queereth also was its compact(s). Then they did findeth another version, and this was slightly different from the first. Then a third, and this was different again. All different, but not really better, for all were not really compatible. diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 40a4021a5c..62fb3d244d 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -160,19 +160,19 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, return makeCLUStream(&fh->file, enc_len); #ifdef USE_MAD case kMP3Mode: { - Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len); + Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES); } #endif #ifdef USE_VORBIS case kVorbisMode: { - Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len); + Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES); } #endif #ifdef USE_FLAC case kFLACMode: { - Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len); + Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeFLACStream(tmp, DisposeAfterUse::YES); } #endif diff --git a/engines/sword25/kernel/inputpersistenceblock.cpp b/engines/sword25/kernel/inputpersistenceblock.cpp index cdce539c31..0fe5d88b80 100644 --- a/engines/sword25/kernel/inputpersistenceblock.cpp +++ b/engines/sword25/kernel/inputpersistenceblock.cpp @@ -86,7 +86,7 @@ void InputPersistenceBlock::read(bool &value) { if (checkMarker(BOOL_MARKER)) { uint uintBool = READ_LE_UINT32(_iter); _iter += 4; - value = uintBool == 0 ? false : true; + value = uintBool != 0; } else { value = false; } diff --git a/engines/sword25/script/luabindhelper.h b/engines/sword25/script/luabindhelper.h index 0cb6d37bdc..5223d4440e 100644 --- a/engines/sword25/script/luabindhelper.h +++ b/engines/sword25/script/luabindhelper.h @@ -40,7 +40,7 @@ namespace Sword25 { #define lua_pushbooleancpp(L, b) (lua_pushboolean(L, b ? 1 : 0)) -#define lua_tobooleancpp(L, i) (lua_toboolean(L, i) == 0 ? false : true) +#define lua_tobooleancpp(L, i) (lua_toboolean(L, i) != 0) struct lua_constant_reg { const char *Name; diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp index f35845e881..c18a947358 100644 --- a/engines/touche/staticres.cpp +++ b/engines/touche/staticres.cpp @@ -888,7 +888,9 @@ const uint8 Graphics::_freGerFontData[] = { // spanish charset differs from original executable, see tracker item #2040311. // We remap missing accented upper case letters from CP850 to their unaccented -// ASCII variants. Specifically, 0xB5 -> A, 0xD6 -> I, 0xE0 -> O, 0xE9 -> U. +// ASCII variants. Specifically, 0xB5 -> A, 0xD6 -> I, 0xE0 -> O, 0xE9 -> U, +// 0xEF -> ' +// FIXME: Shouldn't we just add these to the font data? const uint16 Graphics::_spaFontOffs[] = { 0x0000, 0x0007, 0x0024, 0x0043, 0x0072, 0x00AD, 0x00E0, 0x0113, 0x0124, 0x0141, 0x015E, 0x0191, 0x01C4, 0x01E3, 0x01F8, 0x0215, 0x0232, 0x0269, 0x0286, 0x02BD, @@ -910,7 +912,7 @@ const uint16 Graphics::_spaFontOffs[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0703, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0627, 0x1954, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x097D + 0x0000, 0x097D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0113 }; const int Graphics::_spaFontSize = ARRAYSIZE(Graphics::_spaFontOffs); diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h index 04c6e9bdc2..59bc2b7a51 100644 --- a/engines/tsage/blue_force/blueforce_logic.h +++ b/engines/tsage/blue_force/blueforce_logic.h @@ -119,9 +119,6 @@ public: class NamedObject: public SceneObject { public: - int _resNum; - int _lookLineNum, _talkLineNum, _useLineNum; - virtual Common::String getClassName() { return "NamedObject"; } virtual void synchronize(Serializer &s); virtual void postInit(SceneObjectList *OwnerList = NULL); diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index a303576928..2178f31b30 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -35,7 +35,7 @@ namespace BlueForce { * *--------------------------------------------------------------------------*/ -bool Scene900::Item1::startAction(CursorType action, Event &event) { +bool Scene900::Exterior::startAction(CursorType action, Event &event) { if (action == CURSOR_LOOK) { SceneItem::display2(900, 6); return true; @@ -44,7 +44,7 @@ bool Scene900::Item1::startAction(CursorType action, Event &event) { } } -bool Scene900::Item4::startAction(CursorType action, Event &event) { +bool Scene900::WestExit::startAction(CursorType action, Event &event) { Scene900 *scene = (Scene900 *)BF_GLOBALS._sceneManager._scene; BF_GLOBALS._player.disableControl(); @@ -458,7 +458,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) { _stripManager.addSpeaker(&_jakeJacketSpeaker); _stripManager.addSpeaker(&_lyleHatSpeaker); - _item4.setDetails(Rect(0, 85, 20, 130), 900, -1, -1, -1, 1, 0); + _westExit.setDetails(Rect(0, 85, 20, 130), 900, -1, -1, -1, 1, 0); BF_GLOBALS._player.postInit(); _dog.postInit(); @@ -559,11 +559,11 @@ void Scene900::postInit(SceneObjectList *OwnerList) { setAction(&_sequenceManager1, this, 9002, &BF_GLOBALS._player, &_door, NULL); } - _gate.setDetails(900, 0, -1, 1, 1, 0); - _door.setDetails(900, 2, -1, 5, 1, 0); + _gate.setDetails(900, 0, -1, 1, 1, (SceneItem *)NULL); + _door.setDetails(900, 2, -1, 5, 1, (SceneItem *)NULL); _item2.setDetails(Rect(0, 0, 225, 21), 666, 25, -1, -1, 1, NULL); _item3.setDetails(Rect(37, 21, 324, 50), 666, 26, -1, -1, 1, NULL); - _item1.setDetails(Rect(0, 0, 960, 200), 900, 7, -1, -1, 1, NULL); + _exterior.setDetails(Rect(0, 0, 960, 200), 900, 7, -1, -1, 1, NULL); } void Scene900::signal() { @@ -692,7 +692,7 @@ void Scene900::process(Event &event) { SceneExt::process(event); if (BF_GLOBALS._player._enabled && !_focusObject && (event.mousePos.y < (UI_INTERFACE_Y - 1))) { - if (_item4.contains(event.mousePos)) { + if (_westExit.contains(event.mousePos)) { GfxSurface surface = _cursorVisage.getFrame(EXITFRAME_W); BF_GLOBALS._events.setCursor(surface); } else { @@ -1285,9 +1285,9 @@ bool Scene910::Object13::startAction(CursorType action, Event &event) { } if (_mode != 1) - BF_GLOBALS._breakerBoxStatusArr[_state - 1] = (_state + 251) % 256; + BF_GLOBALS._breakerBoxStatusArr[_state - 1] = (_frame + 251) % 256; else - BF_GLOBALS._breakerBoxStatusArr[_state - 1] = _state; + BF_GLOBALS._breakerBoxStatusArr[_state - 1] = _frame; switch (_state) { case 1: @@ -2209,7 +2209,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { _fakeWall.hide(); if (BF_GLOBALS._v4CECC != 2) _yellowCord.setPosition(Common::Point(291, -30)); - BF_GLOBALS._walkRegions.disableRegion(10); + BF_GLOBALS._walkRegions.enableRegion(10); } if (BF_GLOBALS._breakerBoxStatusArr[17] != 0) { @@ -3375,6 +3375,7 @@ void Scene930::postInit(SceneObjectList *OwnerList) { BF_GLOBALS._player.fixPriority(80); BF_GLOBALS._player.changeZoom(-1); BF_GLOBALS._player.enableControl(); + BF_GLOBALS._events.setCursor(CURSOR_WALK); _item1.setDetails( 1, 930, 0, 1, 2, 1); _item2.setDetails( 2, 930, 4, 5, 6, 1); diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h index 9ae542c21d..74708b94de 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.h +++ b/engines/tsage/blue_force/blueforce_scenes9.h @@ -41,11 +41,11 @@ using namespace TsAGE; class Scene900: public PalettedScene { /* Items */ - class Item1: public NamedHotspot { + class Exterior: public NamedHotspot { public: virtual bool startAction(CursorType action, Event &event); }; - class Item4: public NamedHotspot { + class WestExit: public NamedHotspot { public: virtual bool startAction(CursorType action, Event &event); }; @@ -94,7 +94,7 @@ public: SpeakerGameText _gameTextSpeaker; SpeakerJakeJacket _jakeJacketSpeaker; SpeakerLyleHat _lyleHatSpeaker; - Item1 _item1; + Exterior _exterior; Gate _gate; Door _door; Dog _dog; @@ -104,7 +104,7 @@ public: NamedObject _object5; Lyle _lyle; Body _body; - Item4 _item4; + WestExit _westExit; ASoundExt _sound1; Action1 _action1; Action2 _action2; diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index 5ddc7b6a1a..0781ae4544 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -223,12 +223,14 @@ GfxSurface::GfxSurface() : _bounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) { _lockSurfaceCtr = 0; _customSurface = NULL; _transColor = -1; + _trackDirtyRects = false; } GfxSurface::GfxSurface(const GfxSurface &s) { _lockSurfaceCtr = 0; _customSurface = NULL; - this->operator =(s); + _trackDirtyRects = false; + *this = s; } GfxSurface::~GfxSurface() { diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index 582458afed..a06899fe5a 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -1623,7 +1623,7 @@ AnimationPlayer::AnimationPlayer(): EventHandler() { _screenBounds = R2_GLOBALS._gfxManagerInstance._bounds; _rect1 = R2_GLOBALS._gfxManagerInstance._bounds; - _paletteMode = 0; + _paletteMode = ANIMPALMODE_REPLACE_PALETTE; _field3A = 1; _sliceHeight = 1; _field58 = 1; @@ -1657,14 +1657,14 @@ void AnimationPlayer::process(Event &event) { void AnimationPlayer::dispatch() { uint32 gameFrame = R2_GLOBALS._events.getFrameNumber(); - uint32 gameDiff = (gameFrame > _gameFrame) ? gameFrame - _gameFrame : _gameFrame - gameFrame; + uint32 gameDiff = gameFrame - _gameFrame; if (gameDiff >= _frameDelay) { drawFrame(_playbackTick % _subData._framesPerSlices); ++_playbackTick; _position = _playbackTick / _subData._framesPerSlices; - if (_position == _ticksPerSlices) + if (_position == _nextSlicesPosition) nextSlices(); _playbackTickPrior = _playbackTick; @@ -1694,8 +1694,11 @@ bool AnimationPlayer::load(int animId, Action *endAction) { // Set other properties _playbackTickPrior = -1; _playbackTick = 0; - _frameDelay = 60 / _subData._frameRate; - _gameFrame = R2_GLOBALS._events.getFrameNumber() - _frameDelay; + + // The final multiplication is used to deliberately slow down playback, since the original + // was slowed down by the amount of time spent to decode and display the frames + _frameDelay = (60 / _subData._frameRate) * 8; + _gameFrame = R2_GLOBALS._events.getFrameNumber(); if (_subData._totalSize) { _dataNeeded = _subData._totalSize; @@ -1706,7 +1709,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) { debugC(1, ktSageDebugGraphics, "Data needed %d", _dataNeeded); - // Set up animation data array + // Set up animation data objects _animData1 = new AnimationData(); _sliceCurrent = _animData1; @@ -1719,7 +1722,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) { } _position = 0; - _ticksPerSlices = 1; + _nextSlicesPosition = 1; // Load up the first slices set _sliceCurrent->_dataSize = _subData._slices._dataSize; @@ -1734,21 +1737,25 @@ bool AnimationPlayer::load(int animId, Action *endAction) { // Handle starting palette switch (_paletteMode) { - case 0: - // Use existing active palette + case ANIMPALMODE_REPLACE_PALETTE: + // Use the palette provided with the animation directly _palette.getPalette(); for (int idx = _subData._palStart; idx < (_subData._palStart + _subData._palSize); ++idx) { - uint r, g, b; - _palette.getEntry(idx, &r, &g, &b); + byte r = _subData._palData[idx * 3]; + byte g = _subData._palData[idx * 3 + 1]; + byte b = _subData._palData[idx * 3 + 2]; + R2_GLOBALS._scenePalette.setEntry(idx, r, g, b); } R2_GLOBALS._sceneManager._hasPalette = true; break; - case 2: + case ANIMPALMODE_NONE: break; default: + // ANIMPALMODE_CURR_PALETTE + // Use the closest matching colours in the currently active palette to those specified in the animation for (int idx = _subData._palStart; idx < (_subData._palStart + _subData._palSize); ++idx) { byte r = _subData._palData[idx * 3]; byte g = _subData._palData[idx * 3 + 1]; @@ -1855,12 +1862,26 @@ void AnimationPlayer::drawFrame(int sliceIndex) { break; } - if (_field56 == 42) { + // Unlock the screen surface + R2_GLOBALS._screenSurface.unlockSurface(); + + if (_objectMode == 42) { _screenBounds.expandPanes(); + + // Copy the drawn frame to the back surface + Rect srcRect = R2_GLOBALS._screenSurface.getBounds(); + Rect destRect = srcRect; + destRect.translate(-g_globals->_sceneOffset.x, -g_globals->_sceneOffset.y); + R2_GLOBALS._sceneManager._scene->_backSurface.copyFrom(R2_GLOBALS._screenSurface, + srcRect, destRect); + + // Draw any objects into the scene R2_GLOBALS._sceneObjects->draw(); } else { - if (R2_GLOBALS._sceneManager._hasPalette) + if (R2_GLOBALS._sceneManager._hasPalette) { + R2_GLOBALS._sceneManager._hasPalette = false; R2_GLOBALS._scenePalette.refresh(); + } } } @@ -1868,7 +1889,7 @@ void AnimationPlayer::drawFrame(int sliceIndex) { * Read the next frame's slice set */ void AnimationPlayer::nextSlices() { - _position = _ticksPerSlices++; + _position = _nextSlicesPosition++; _playbackTick = _position * _subData._framesPerSlices; _playbackTickPrior = _playbackTick - 1; @@ -1913,7 +1934,7 @@ void AnimationPlayer::close() { // Close the resource file _resourceFile.close(); - if (_field56 != 42) { + if (_objectMode != 42) { // flip screen in original } @@ -1924,7 +1945,8 @@ void AnimationPlayer::close() { _animData2 = NULL; _field38 = 0; - R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr, 0); + if (g_globals != NULL) + R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr, 0); } void AnimationPlayer::rleDecode(const byte *pSrc, byte *pDest, int size) { diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h index 3d2ffd9f78..0b573bf7f0 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.h +++ b/engines/tsage/ringworld2/ringworld2_logic.h @@ -375,6 +375,9 @@ public: int _animSlicesSize; }; +enum AnimationPaletteMode { ANIMPALMODE_REPLACE_PALETTE = 0, ANIMPALMODE_CURR_PALETTE = 1, + ANIMPALMODE_NONE = 2 }; + class AnimationPlayer: public EventHandler { private: void rleDecode(const byte *pSrc, byte *pDest, int size); @@ -390,7 +393,7 @@ public: Rect _rect1, _screenBounds; int _field38; int _field3A, _paletteMode; - int _field56; + int _objectMode; int _field58, _sliceHeight; byte _palIndexes[256]; ScenePalette _palette; @@ -400,7 +403,7 @@ public: int _playbackTick; int _playbackTickPrior; int _position; - int _ticksPerSlices; + int _nextSlicesPosition; uint _frameDelay; uint32 _gameFrame; public: diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 460646c05d..4c98fcf00a 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -1549,18 +1549,18 @@ void Scene180::signal() { switch (_sceneMode++) { case 0: - setFrameInc(6); + setSceneDelay(6); break; case 1: _field412 = 1; R2_GLOBALS._sceneManager._hasPalette = true; - _animationPlayer._paletteMode = 2; + _animationPlayer._paletteMode = ANIMPALMODE_NONE; _animationPlayer._v = 1; - _animationPlayer._field56 = 1; + _animationPlayer._objectMode = 1; R2_GLOBALS._scene180Mode = 1; - _animationPlayer.load(1, NULL); + _animationPlayer.load(1); R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256); R2_GLOBALS._sound1.play(1); @@ -1571,9 +1571,9 @@ void Scene180::signal() { R2_GLOBALS._paneRefreshFlag[0] = 3; if (R2_GLOBALS._sound1.isPlaying()) { - setFrameInc(1); + setSceneDelay(1); } else { - setFrameInc(180); + setSceneDelay(180); } break; @@ -1583,7 +1583,7 @@ void Scene180::signal() { if (R2_GLOBALS._sound1.isPlaying()) _sceneMode = 3; - setFrameInc(1); + setSceneDelay(1); break; case 4: @@ -1598,9 +1598,9 @@ void Scene180::signal() { break; case 5: - _animationPlayer._paletteMode = 2; + _animationPlayer._paletteMode = ANIMPALMODE_NONE; _animationPlayer._v = 1; - _animationPlayer._field56 = 1; + _animationPlayer._objectMode = 1; R2_GLOBALS._scene180Mode = 2; _animationPlayer.load(2); @@ -1614,28 +1614,30 @@ void Scene180::signal() { R2_GLOBALS._paneRefreshFlag[0] = 3; if (R2_GLOBALS._sound1.isPlaying()) { - setFrameInc(1); + setSceneDelay(1); } else { - setFrameInc(180); + setSceneDelay(180); } break; case 7: + // Title screen. Wait until title music finishes playing R2_GLOBALS._scene180Mode = 2; - if (R2_GLOBALS._sound1.isPaused()) + if (R2_GLOBALS._sound1.isPlaying()) _sceneMode = 7; - setFrameInc(1); + setSceneDelay(1); break; case 9: R2_GLOBALS._sound1.play(3); - setFrameInc(2); + clearScreen(); + setSceneDelay(2); break; case 10: loadScene(4002); R2_GLOBALS._scenePalette.loadPalette(0); - setFrameInc(6); + setSceneDelay(6); break; case 11: @@ -1654,7 +1656,7 @@ void Scene180::signal() { case 24: case 26: case 46: - setFrameInc((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18); + setSceneDelay((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18); break; case 13: @@ -1689,7 +1691,7 @@ void Scene180::signal() { _field412 = 0; _object4.remove(); _object5.remove(); - setFrameInc(2); + setSceneDelay(2); break; case 28: @@ -1701,9 +1703,9 @@ void Scene180::signal() { case 29: _field412 = 1; - _animationPlayer._paletteMode = 0; + _animationPlayer._paletteMode = ANIMPALMODE_REPLACE_PALETTE; _animationPlayer._v = 1; - _animationPlayer._field56 = 42; + _animationPlayer._objectMode = 42; R2_GLOBALS._scene180Mode = 3; _animationPlayer.load(3); break; @@ -1725,7 +1727,7 @@ void Scene180::signal() { if (R2_GLOBALS._sceneManager._hasPalette) R2_GLOBALS._scenePalette.refresh(); - setFrameInc(6); + setSceneDelay(6); break; case 32: @@ -1797,19 +1799,19 @@ void Scene180::signal() { case 39: R2_GLOBALS._sound1.changeSound(8); - setFrameInc(1); + setSceneDelay(1); break; case 40: - _animationPlayer._paletteMode = 2; - _animationPlayer._field56 = 1; + _animationPlayer._paletteMode = ANIMPALMODE_NONE; + _animationPlayer._objectMode = 1; R2_GLOBALS._scene180Mode = 4; if (_animationPlayer.load(4)) { _animationPlayer.dispatch(); R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 8, this); } else { _sceneMode = 43; - setFrameInc(1); + setSceneDelay(1); } break; @@ -1821,7 +1823,7 @@ void Scene180::signal() { case 42: R2_GLOBALS._scene180Mode = 4; R2_GLOBALS._paneRefreshFlag[0] = 3; - setFrameInc(1); + setSceneDelay(1); break; case 44: @@ -1830,7 +1832,7 @@ void Scene180::signal() { if (R2_GLOBALS._sceneManager._hasPalette) R2_GLOBALS._scenePalette.refresh(); - setFrameInc(6); + setSceneDelay(6); break; case 45: @@ -1839,9 +1841,9 @@ void Scene180::signal() { case 48: _field412 = 1; - _animationPlayer._paletteMode = 2; + _animationPlayer._paletteMode = ANIMPALMODE_NONE; _animationPlayer._v = 1; - _animationPlayer._field56 = 1; + _animationPlayer._objectMode = 1; R2_GLOBALS._scene180Mode = 15; _animationPlayer.load(15, NULL); @@ -1852,7 +1854,7 @@ void Scene180::signal() { case 49: R2_GLOBALS._scene180Mode = 15; R2_GLOBALS._paneRefreshFlag[0] = 3; - setFrameInc(1); + setSceneDelay(1); break; case 50: @@ -1863,7 +1865,7 @@ void Scene180::signal() { } } -void Scene180::setFrameInc(int v) { +void Scene180::setSceneDelay(int v) { _frameInc = v; _frameNumber = R2_GLOBALS._events.getFrameNumber(); } diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index e39efbca3d..2f52f9578f 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -195,7 +195,7 @@ class Scene180: public SceneExt { void signal(); }; private: - void setFrameInc(int v); + void setSceneDelay(int v); public: SpeakerWebbster _webbsterSpeaker; SpeakerDutyOfficer _dutyOfficerSpeaker; diff --git a/graphics/imagedec.h b/graphics/imagedec.h index e839d097b2..b03b8bc36b 100644 --- a/graphics/imagedec.h +++ b/graphics/imagedec.h @@ -36,7 +36,6 @@ struct Surface; class ImageDecoder { public: - ImageDecoder() {} virtual ~ImageDecoder() {} static Surface *loadFile(const Common::String &name, const PixelFormat &format); diff --git a/gui/credits.h b/gui/credits.h index 154f577fba..ecfe280d20 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -459,6 +459,9 @@ static const char *credits[] = { "C1""Translations", "C0""Thierry Crozat", "C2""Translation Lead", +"C1""Basque", +"C0""Mikel Iturbe Urretxa", +"", "C1""Catalan", "C0""Jordi Vilalta Prat", "", diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 26e62dc1d9..972163df6f 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -200,9 +200,8 @@ void Debugger::enter() { bool Debugger::handleCommand(int argc, const char **argv, bool &result) { if (_cmds.contains(argv[0])) { - Debuglet *debuglet = _cmds[argv[0]].get(); - assert(debuglet); - result = (*debuglet)(argc, argv); + assert(_cmds[argv[0]]); + result = (*_cmds[argv[0]])(argc, argv); return true; } diff --git a/gui/dialog.cpp b/gui/dialog.cpp index fd15ba5e09..2201e83ca5 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -21,6 +21,10 @@ #include "common/rect.h" +#ifdef ENABLE_KEYMAPPER +#include "common/events.h" +#endif + #include "gui/gui-manager.h" #include "gui/dialog.h" #include "gui/widget.h" @@ -314,6 +318,9 @@ void Dialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { } } +#ifdef ENABLE_KEYMAPPER +void Dialog::handleOtherEvent(Common::Event evt) { } +#endif /* * Determine the widget at location (x,y) if any. Assumes the coordinates are * in the local coordinate system, i.e. relative to the top left of the dialog. diff --git a/gui/dialog.h b/gui/dialog.h index a324450996..f5a5f94a68 100644 --- a/gui/dialog.h +++ b/gui/dialog.h @@ -29,6 +29,12 @@ #include "gui/object.h" #include "gui/ThemeEngine.h" +#ifdef ENABLE_KEYMAPPER +namespace Common { +struct Event; +} +#endif + namespace GUI { class Widget; @@ -82,6 +88,9 @@ protected: virtual void handleKeyUp(Common::KeyState state); virtual void handleMouseMoved(int x, int y, int button); virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); +#ifdef ENABLE_KEYMAPPER + virtual void handleOtherEvent(Common::Event evt); +#endif Widget *findWidget(int x, int y); // Find the widget at pos x,y if any Widget *findWidget(const char *name); diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index 4fa60bfe07..ffecd928bc 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -366,6 +366,9 @@ void GuiManager::runLoop() { screenChange(); break; default: +#ifdef ENABLE_KEYMAPPER + activeDialog->handleOtherEvent(event); +#endif break; } diff --git a/gui/options.cpp b/gui/options.cpp index 39f8d9ccb6..6747195a1b 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1010,7 +1010,7 @@ bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String se for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { if (setting.empty() ? (preferredType == d->getMusicType()) : (drv == d->getCompleteId())) { popup->setSelectedTag(d->getHandle()); - return popup->getSelected() == -1 ? false : true; + return popup->getSelected() != -1; } } } diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex 0dcd6065a8..d3a384ef77 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/po/ca_ES.po b/po/ca_ES.po index 6dc8b6a008..4c0ad8bbbe 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-10-04 20:51+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" -"Language: Catalan\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Catalan\n" #: gui/about.cpp:91 #, c-format @@ -43,13 +43,13 @@ msgid "Go up" msgstr "Amunt" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "CancelЗla" @@ -68,15 +68,15 @@ msgstr "Tanca" msgid "Mouse click" msgstr "Clic del ratolэ" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Mostra el teclat" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Assigna les tecles" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Commuta la pantalla completa" @@ -89,16 +89,17 @@ msgstr "SelЗleccioneu una acciѓ a assignar" msgid "Map" msgstr "Assigna" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -126,15 +127,15 @@ msgstr "Seleccioneu una acciѓ" msgid "Press the key to associate" msgstr "Premeu la tecla a associar" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Joc" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "Identificador:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -142,29 +143,29 @@ msgstr "" "Identificador de joc curt utilitzat per referir-se a les partides i per " "executar el joc des de la lэnia de comandes" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Tэtol complet del joc" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Idioma:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -172,283 +173,283 @@ msgstr "" "Idioma del joc. Aixђ no convertirр la vostra versiѓ Espanyola del joc a " "Anglшs" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<per defecte>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plataforma:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plataforma per la que el joc es va dissenyar originalment" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Platafor.:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grрfics" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Fer canvis sobre les opcions globals de grрfics" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Canviar les opcions de grрfics" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Рudio" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Fer canvis sobre les opcions globals d'рudio" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Canviar les opcions d'рudio" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Fer canvis sobre les opcions globals de volum" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Canviar les opcions de volum" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Fer canvis sobre les opcions globals de MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Canviar les opcions de MIDI" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Fer canvis sobre les opcions globals de MT-32" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Canviar les opcions de MT-32" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Camэ del joc:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Camэ joc:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Especifica el camэ de dades addicionals utilitzades pel joc" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Camэ de partides:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Especifica on es desaran les partides" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Partides:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Cap" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Per defecte" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Seleccioneu el fitxer SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Seleccioneu el directori amb les dades del joc" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Seleccioneu el directori addicional del joc" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Seleccioneu el directori de les partides desades" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "" "Aquest identificador de joc ja estр en њs. Si us plau, trieu-ne un altre." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~T~anca" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Surt de ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "~Q~uant a..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Quant a ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~pcions..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Canvia les opcions globals de ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~I~nicia" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Iniciant el joc seleccionat" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~C~arrega..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Carrega una partida pel joc seleccionat" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~A~fegeix Joc..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Mantingueu premut Shift per a l'Addiciѓ Massiva" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~E~dita Joc..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Canvia les opcions del joc" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~S~uprimeix Joc" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "" "Elimina un joc de la llista. Els fitxers de dades del joc es mantenen " "intactes" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~fegeix Joc..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~dita Joc..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~S~uprimeix" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Cerca a la llista de jocs" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Cerca:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Carrega partida:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Carrega" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -456,7 +457,7 @@ msgstr "" "Esteu segur que voleu executar el detector massiu de jocs? Aixђ pot afegir " "una gran quantitat de jocs." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -464,7 +465,7 @@ msgstr "" msgid "Yes" msgstr "Sэ" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -472,37 +473,37 @@ msgstr "Sэ" msgid "No" msgstr "No" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM no ha pogut obrir el directori especificat!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM no ha pogut trobar cap joc al directori especificat!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Seleccioneu el joc:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Realment voleu suprimir la configuraciѓ d'aquest joc?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Aquest joc no suporta la cрrrega de partides des del llanчador." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM no ha pogut trobar cap motor capaч d'executar el joc seleccionat!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Afegeix Jocs" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Addiciѓ Massiva..." @@ -530,141 +531,141 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "S'han trobat %d jocs nous, s'han ignorat %d jocs afegits anteriorment ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Mai" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "cada 5 minuts" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "cada 10 minuts" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "cada 15 minuts" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "cada 30 minuts" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Cap" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "No s'han pogut aplicar alguns canvis de les opcions grрfiques:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "no s'ha pogut canviar el mode de vэdeo" -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "no s'ha pogut canviar l'ajust de pantalla completa" -#: gui/options.cpp:415 +#: gui/options.cpp:417 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:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Mode grрfic:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Mode de pintat:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Modes de tramat especials suportats per alguns jocs" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Mode pantalla completa" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Elimina el tramat d'EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Activa l'eliminaciѓ del tramat en els jocs EGA que ho suportin" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Disp. preferit:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 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:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 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:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferit:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib s'utilitza per la mњsica de molts jocs" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Freq. sortida:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -672,63 +673,63 @@ msgstr "" "Valors mщs alts especifiquen millor qualitat de so perђ pot ser que la " "vostra tarja de so no ho suporti" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Dispositiu GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 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:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "No utilitzis mњsica General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Utilitza el primer dispositiu disponible" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "Fitxer SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "Algunes targes de so, Fluidsynth i Timidity suporten SoundFont" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Mode combinat AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Guany MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -736,196 +737,196 @@ msgstr "" "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so " "compatible amb Roland connectat al vostre ordinador" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Activa el Mode Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Desactiva la conversiѓ General MIDI pels jocs que tenen banda sonora per a " "Roland MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "No utilitzis mњsica de Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Veus" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Subtэtols" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Velocitat de subt.:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Veus" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Mostra els subtэtols i reprodueix la veu" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Veloc. de subt.:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Silenciar tot" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volum dels sons d'efectes especials" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Camэ dels temes:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Camэ temes:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Camэ dels connectors:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camэ de connectors:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Pintat GUI:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Desat automрtic:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-desat:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Tecles" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Idioma GUI:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfэcie d'usuari de ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Seleccioneu el directori de les partides desades" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Seleccioneu el directori dels temes" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Seleccioneu el directori dels fitxers extra" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Seleccioneu el directori dels connectors" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1007,22 +1008,22 @@ msgstr "Neteja el valor" msgid "Engine does not support debug level '%s'" msgstr "El motor no suporta el nivell de depuraciѓ '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Salta" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Salta la lэnia" @@ -1098,25 +1099,6 @@ msgstr "CancelЗlat per l'usuari" msgid "Unknown error" msgstr "Error desconegut" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Verd" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Рmbar" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Verd" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Рmbar" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1188,17 +1170,26 @@ msgstr "" "Aquest motor no ofereix ajuda dins el joc. Consulteu el fitxer README per a " "la informaciѓ bрsica i les instruccions sobre com obtenir mщs assistшncia." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Aquest motor no ofereix ajuda dins el joc. Consulteu el fitxer README per a " +"la informaciѓ bрsica i les instruccions sobre com obtenir mщs assistшncia." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~D~'acord" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~C~ancelЗla" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~ecles" @@ -1246,7 +1237,16 @@ msgstr "" "tal de poder sentir la mњsica del joc.\n" "Consulteu el fitxer README per a mщs detalls." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Aquest motor no ofereix ajuda dins el joc. Consulteu el fitxer README per a " +"la informaciѓ bрsica i les instruccions sobre com obtenir mщs assistшncia." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1256,7 +1256,7 @@ msgstr "" "pel ScummVM. Com a tal, probablement serр inestable, i pot ser que les " "partides que deseu no funcionin en versions futures de ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Inicia de totes maneres" @@ -1300,7 +1300,7 @@ msgstr "Jugar" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Surt" @@ -2000,11 +2000,11 @@ msgid "Cutscene file '%s' not found!" msgstr "No s'ha trobat el fitxer d'escena '%s'!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "No s'ha pogut carregar l'estat del joc del fitxer." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "No s'ha pogut desar l'estat del joc al fitxer." @@ -2100,17 +2100,22 @@ msgstr "" "El fitxer \"sky.cpt\" tщ una mida incorrecta.\n" "Torneu a baixar-lo de www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "S'han trobat escenes en DXA, perђ s'ha compilat el ScummVM sense suport de " "zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Les escenes MPEG2 ja no estan suportades" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "No s'ha trobat l'escena '%s'" @@ -2154,6 +2159,14 @@ msgstr "Mantingues el nou" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Aquest щs el final de la Demo del Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"S'han trobat escenes en DXA, perђ s'ha compilat el ScummVM sense suport de " +"zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2212,7 +2225,7 @@ msgstr "Emulador OPL de MAME" msgid "DOSBox OPL emulator" msgstr "Emulador OPL de DOSBox" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2221,12 +2234,12 @@ msgstr "" "No s'ha pogut trobar el dispositiu d'рudio seleccionat '%s' (p.e. pot estar " "desactivat o desconnectat)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Provant de recѓrrer al segќent dispositiu disponible..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2235,7 +2248,7 @@ msgstr "" "No es pot utilitzar el dispositiu d'рudio seleccionat '%s'. Vegeu el fitxer " "de registre per a mщs informaciѓ." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2244,7 +2257,7 @@ msgstr "" "No s'ha pogut trobar el dispositiu d'рudio preferit '%s' (p.e. pot estar " "desactivat o desconnectat)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2302,11 +2315,15 @@ msgstr " (Actiu)" msgid " (Active)" msgstr " (Actiu)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Joc)" @@ -2386,27 +2403,27 @@ msgstr "Alta qualitat d'рudio (mщs lent) (reiniciar)" msgid "Disable power off" msgstr "Desactiva l'apagat automрtic" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "S'ha activat el mode de clic-i-arrossega." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "S'ha desactivat el mode clic-i-arrossega." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Mode Touchpad activat." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Mode Touchpad desactivat." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2414,12 +2431,12 @@ msgstr "" msgid "Left Click" msgstr "Clic esquerre" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Element mig esquerre" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2811,15 +2828,15 @@ msgstr "" "No us oblideu d'assignar una tecla a l'acciѓ 'Ocultar la barra d'eines' per " "veure l'inventari complet" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Realment voleu tornar al Llanчador?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Llanчador" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Estрs segur de voler sortir?" @@ -2893,5 +2910,19 @@ msgstr "Clicat activat" msgid "Clicking Disabled" msgstr "Clicat desactivat" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Verd" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Рmbar" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Verd" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Рmbar" + #~ msgid "Save game failed!" #~ msgstr "No s'ha pogut desar la partida!" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 433a6f620c..feca25ee9c 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" -"PO-Revision-Date: 2011-12-27 17:46+0100\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" +"PO-Revision-Date: 2012-02-17 16:28+0100\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" -"Language: Cesky\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Cesky\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "Jэt nahoru" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "ZruЙit" @@ -72,18 +72,17 @@ msgstr "Zavјэt" msgid "Mouse click" msgstr "Kliknutэ myЙэ" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Zobrazit klсvesnici" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Pјemapovat klсvesy" -#: gui/gui-manager.cpp:127 base/main.cpp:295 -#, fuzzy +#: gui/gui-manager.cpp:129 base/main.cpp:295 msgid "Toggle FullScreen" -msgstr "Zapnout celou obrazovku" +msgstr "Pјepnout celou obrazovku" #: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" @@ -93,16 +92,17 @@ msgstr "Zvolte шinnost k mapovсnэ" msgid "Map" msgstr "Mapovat" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -130,15 +130,15 @@ msgstr "Prosэm vyberte шinnost" msgid "Press the key to associate" msgstr "Zmсшknьte klсvesu pro pјiјazenэ" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Hra" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -146,308 +146,308 @@ msgstr "" "Krсtk§ identifikсtor her, pouОэvan§ jako odkaz k uloОen§m hrсm a spuЙtьnэ " "hry z pјэkazovщho јсdku" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Jmщno" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "кpln§ nсzev hry" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Jmщno:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Jazyk:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "Jazyk hry. Toto z VaЙэ Љpanьlskщ verze neudьlс Anglickou" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<v§chozэ>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Platforma, pro kterou byla hra pљvodnь vytvoјena" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Obraz" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Zvuk" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Cesta pro uloОenэ:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Stanovuje, kam jsou umэstьny VaЙe uloОenщ hry" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Cesta pro uloОenэ:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Ўсdnщ" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "V§chozэ" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Vybrat SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Vyberte adresсј s daty hry" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Vyberte dodateшn§ adresсј hry" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Vyberte adresсј pro uloОenщ hry" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Toto ID hry je uО zabranщ. Vyberte si, prosэm, jinщ." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~U~konшit" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Ukonшit ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "~O~ Programu..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "O ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~V~olby..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Zmьnit globсlnэ volby ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~pustit" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Spustit zvolenou hru" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~N~ahrсt..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Nahrсt uloОenou pozici pro zvolenou hru" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~P~јidat hru..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "PodrОte Shift pro Hromadnщ Pјidсnэ" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~U~pravit Hru..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Zmьnit volby hry" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~O~dstranit Hru" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Odstranit hru ze seznamu. Hernэ data zљstanou zachovсna" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~P~јidat hru..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~U~pravit hru..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~O~dstranit hru" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Hledat v seznamu her" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Hledat:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Nahrсt hru:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Nahrсt" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -455,7 +455,7 @@ msgstr "" "Opravdu chcete spustit hromadnou detekci her? Toto by mohlo potenciсlnь " "pјidat velkou spoustu her. " -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -463,7 +463,7 @@ msgstr "" msgid "Yes" msgstr "Ano" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -471,36 +471,36 @@ msgstr "Ano" msgid "No" msgstr "Ne" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nemohl tento adresсј otevјэt!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM nemohl v zadanщm adresсјi najэt Осdnou hru!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Vybrat hru:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Opravdu chcete odstranit nastavenэ tщto hry?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Tato hra nepodporuje spouЙtьnэ her ze spouЙtьшe" -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM nemohl najэt Осdnщ jсdro schopnщ vybranou hru spustit!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Hromadnщ Pјidсnэ..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Hromadnщ Pјidсnэ..." @@ -527,141 +527,141 @@ msgstr "Prohledсno %d adresсјљ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Objeveno %d nov§ch her, ignorovсno %d dјэve pјidan§ch her ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Nikdy" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "KaОd§ch 5 min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "KaОd§ch 10 min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "KaОd§ch 15 min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "KaОd§ch 30 min" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Ўсdnщ" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "reОim obrazu nemohl b§t zmьnьn." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "ReОim obrazu:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "ReОim vykreslenэ:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "ReОim celщ obrazovky" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Korekce pomьru stran" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Korigovat pomьr stran pro hry 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Nerozklсdсnэ EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Povolit nerozklсdсnэ v EGA hrсch, kterщ to podporujэ" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Prioritnэ Zaјэzenэ:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Prioritnэ Zaј.:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib emulсtor" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "V§stup. frekvence:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -669,62 +669,62 @@ msgstr "" "VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi " "zvukovou kartou" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "GM Zaјэzenэ:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "NepouОэvat hudbu General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "PouОэt prvnэ dostupnщ zaјэzenэ" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "SmэЙen§ reОim AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "PouОэt obь zvukovщ generace MIDI a AdLib" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Zesэlenэ MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Zaјэzenэ MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -732,190 +732,190 @@ msgstr "" "ZaЙkrtnьte, pokud chcete pouОэt pravщ hardwarovщ zaјэzenэ kompatibilnэ s " "Roland, pјipojenщ k VaЙemu poшэtaшi" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Zapnout reОim Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Vypne mapovсnэ General MIDI pro hry s Roland MT-32 zvukov§m doprovodem" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "NepouОэvat hudbu Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Text a иeш" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "иeш" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Titulky" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Oba" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "иeш" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Titl" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Zobrazit titulky a pјehrсvat јeш" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Rychlost titulkљ" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Ztlumit VЙe" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Hlasitost speciсlnэch zvukov§ch efektљ" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Vzhled:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI Vykreslovaш:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Klсvesy" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Jazyk GUI" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Jazyk GUI ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Vybrat adresсј pro uloОenщ hry" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Vyberte adresсј pro vhledy GUI" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Vyberte adresсј pro dodateшnщ soubory" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Vyberte adresсј pro zсsuvnщ moduly" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -997,22 +997,22 @@ msgstr "Vyшistit hodnotu" msgid "Engine does not support debug level '%s'" msgstr "Jсdro nepodporuje њroveђ ladьnэ '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menu" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Pјeskoшit" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pauza" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Pјeskoшit јсdek" @@ -1088,25 +1088,6 @@ msgstr "ZruЙeno uОivatelem" msgid "Unknown error" msgstr "Neznсmс chyba" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Zelenс" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Jantarovс" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Zelenс" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Jantarovс" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1178,17 +1159,27 @@ msgstr "" "prohlщdnьte si README pro zсkladnэ informace a pro instrukce jak zэskat " "dalЙэ pomoc." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Je nсm lэto, ale toto jсdro v souшasnosti nepodporuje hernэ nсpovьdu. Prosэm " +"prohlщdnьte si README pro zсkladnэ informace a pro instrukce jak zэskat " +"dalЙэ pomoc." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~Z~ruЙit" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~K~lсvesy" @@ -1236,7 +1227,17 @@ msgstr "" "abyste mohli poslouchat hudbu ve hјe.\n" "Pro podrobnosti si pјeшtьte README." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Je nсm lэto, ale toto jсdro v souшasnosti nepodporuje hernэ nсpovьdu. Prosэm " +"prohlщdnьte si README pro zсkladnэ informace a pro instrukce jak zэskat " +"dalЙэ pomoc." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1246,7 +1247,7 @@ msgstr "" "ScummVM. Proto je moОnщ, Оe bude nestabilnэ a jakщkoli uloОenщ hry nemusэ " "fungovat v budoucэch verzэch ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Pјesto spustit" @@ -1290,7 +1291,7 @@ msgstr "Hrсt" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Ukonшit" @@ -1989,11 +1990,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Soubor videa '%s' nenalezen'" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Nelze naшэst stav hry ze souboru." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Nelze uloОit stav hry do souboru." @@ -2083,15 +2084,20 @@ msgstr "" "Soubor \"sky.cpt\" mс nesprсvnou velikost.\n" "Stсhnьte si ho, prosэm, (znovu) z www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "Videa DXA nalezena, ale ScummVM byl sestaven bez podpory zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Videa MPGE2 jiО nejsou podporovсna" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Video '%s' nenalezeno" @@ -2135,6 +2141,12 @@ msgstr "Ponechat novou" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Toto je konec Dema Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "Videa DXA nalezena, ale ScummVM byl sestaven bez podpory zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2192,7 +2204,7 @@ msgstr "MAME OPL Emulсtor" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL Emulсtor" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2201,12 +2213,12 @@ msgstr "" "Zvolenщ zvukovщ zaјэzenэ '%s' nebylo nalezeno (napј. mљОe b§t vypnuto nebo " "odpojeno)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Pokus o navrсcenэ na nejbliОЙэ dostupnщ zaјэzenэ..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2215,7 +2227,7 @@ msgstr "" "Zvolenщ zvukovщ zaјэzenэ '%s' nelze pouОэt. Podэvejte se na zсznam pro vэce " "informacэ." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2224,7 +2236,7 @@ msgstr "" "Upјednostђovanщ zvukovщ zaјэzenэ '%s' nebylo nalezeno (napј. mљОe b§t " "vypnuto nebo odpojeno)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2274,19 +2286,22 @@ msgid "Keymap:" msgstr "Mapa Klсves:" #: backends/keymapper/remap-dialog.cpp:66 -#, fuzzy msgid " (Effective)" -msgstr "(Aktivnэ)" +msgstr " (Aktivnэ)" #: backends/keymapper/remap-dialog.cpp:106 msgid " (Active)" msgstr "(Aktivnэ)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr "(Globсlnэ)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr "(Hra)" @@ -2366,27 +2381,27 @@ msgstr "Vysokс kvalita zvuku (pomalejЙэ) (restart) " msgid "Disable power off" msgstr "Zakсzat vypnutэ" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "ReОim pјetсhnutэ myЙi zapnut." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "ReОim pјetсhnutэ myЙi vypnut." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Touchpad reОim zapnut" -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Touchpad reОim vypnut" -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" -msgstr "" +msgstr "ReОim kliknutэ" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2394,12 +2409,11 @@ msgstr "" msgid "Left Click" msgstr "Levщ Kliknutэ" -#: backends/platform/maemo/maemo.cpp:187 -#, fuzzy +#: backends/platform/maemo/maemo.cpp:214 msgid "Middle Click" -msgstr "PoloОka vlevo uprostјed" +msgstr "Kliknutэ prostјednэm tlaшэtkem" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2793,15 +2807,15 @@ msgstr "" "Nezapomeђte namapovat klсvesu k шinnosti 'Skr§t Panel Nсstrojљ, abyste " "vidьli cel§ inventсј" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Opravdu se chcete vrсtit tuto do SpouЙtьшe?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "SpouЙtьш" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Opravdu chcete skonшit?" @@ -2875,6 +2889,20 @@ msgstr "Kliknutэ Povoleno" msgid "Clicking Disabled" msgstr "Kliknutэ Zakсzсno" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Zelenс" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Jantarovс" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Zelenс" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Jantarovс" + #~ msgid "Save game failed!" #~ msgstr "Uklсdсnэ hry selhalo!" diff --git a/po/da_DA.po b/po/da_DA.po index e31affb0f7..59f7ae63a7 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-01-08 22:53+0100\n" "Last-Translator: Steffen Nyeland <steffen@nyeland.dk>\n" "Language-Team: Steffen Nyeland <steffen@nyeland.dk>\n" -"Language: Dansk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Dansk\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: gui/about.cpp:91 @@ -43,13 +43,13 @@ msgid "Go up" msgstr "Gх op" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Fortryd" @@ -68,15 +68,15 @@ msgstr "Luk" msgid "Mouse click" msgstr "Muse klik" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Kortlцg taster" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Skift fuldskцrm" @@ -89,16 +89,17 @@ msgstr "Vцlg en handling at kortlцgge" msgid "Map" msgstr "Kortlцg" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -126,15 +127,15 @@ msgstr "Vцlg venligst en handling" msgid "Press the key to associate" msgstr "Tryk tasten for at tilknytte" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Spil" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -142,29 +143,29 @@ msgstr "" "Kort spil identifikator til brug for gemmer, og for at kјre spillet fra " "kommandolinien" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Fuld titel pх spillet" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Sprog:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -172,280 +173,280 @@ msgstr "" "Spillets sprog. Dette vil ikke цndre din spanske version af spillet til " "engelsk" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Platform som spillet oprindeligt var designet til" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Lyd" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Angiver sti til ekstra data der bruges i spillet" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Gemme sti:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Gemme sti:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Vцlg SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Vцlg bibliotek med spil data" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Vцlg ekstra spil bibliotek" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Vцlg bibliotek til spil gemmer" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Dette spil ID er allerede i brug. Vцlg venligst et andet." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~fslut" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Slut ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~I~ndstillinger..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Цndre globale ScummVM indstillinger" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Start det valgte spil" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~H~ent..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Hent gemmer for det valgte spil" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~T~ilfјj spil..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Hold Skift for at tilfјje flere" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~R~ediger spil..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Цndre spil indstillinger" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~F~jern spil" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Fjerner spil fra listen. Spillets data filer forbliver uberјrt" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~T~ilfјj spil..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~R~ediger spil..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~F~jern spil" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Sјg i spil liste" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Sјg:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Indlцs spil:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Indlцs" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -453,7 +454,7 @@ msgstr "" "Vil du virkelig kјre fler spils detektoren? Dette kunne potentielt tilfјje " "et stort antal spil." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -461,7 +462,7 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -469,37 +470,37 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunne ikke хbne det angivne bibliotek!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM kunne ikke finde noget spil i det angivne bibliotek!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Vцlg spillet:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Vil du virkelig fjerne denne spil konfiguration?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Dette spil understјtter ikke hentning af spil fra spiloversigten." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM kunne ikke finde en motor, istand til at afvikle det valgte spil!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Tilfјj flere..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Tilfјj flere..." @@ -526,141 +527,141 @@ msgstr "Gennemset %d biblioteker ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Fundet %d nye spil ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "hvert 5. minut" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "hvert 10. minut" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "hvert 15. minut" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "hvert 30. minut" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Grafik tilstand:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understјttet a nogle spil" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Fuldskцrms tilstand" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Billedformat korrektion" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrekt billedformat til 320x200 spil" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA farveforјgelse" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Aktiver farveforјgelse i EGA spil der understјtter det" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Foretruk. enhed:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretruk. enh.:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -668,60 +669,60 @@ msgstr "" "Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit " "lydkort" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "GM enhed:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Angiver standard lyd enhed for General MIDI udgang" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Brug ikke General MIDI musik" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Brug fјrste tilgцngelig enhed" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Blandet AdLib/MIDI tilstand" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Brug bхde MIDI og AdLib lyd generering" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "MIDI lydstyrke:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "MT-32 enhed:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -729,191 +730,191 @@ msgstr "" "Kontroller om du vil bruge din rigtige hardware Roland-kompatible lyd enhed " "tilsluttet til din computer" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Цgte Roland MT-32 (ingen GM emulering)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Aktivщr Roland GS tilstand" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Sluk for General MIDI kortlцgning for spil med Roland MT-32 lydspor" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Brug ikke Roland MT-32 musik" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Begge" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Vis undertekster og afspil tale" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Mute alle" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI renderer:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Sprog:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 #, fuzzy msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du skal genstarte ScummVM for at цndringer vises." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Vцlg bibliotek til gemmer" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Vцlg bibliotek for GUI temaer" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Vцlg bibliotek for plugins" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -995,22 +996,22 @@ msgstr "Slet vцrdi" msgid "Engine does not support debug level '%s'" msgstr "Motor understјtter ikke fejlfindingsniveau '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menu" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Spring over" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Spring linje over" @@ -1093,25 +1094,6 @@ msgstr "" msgid "Unknown error" msgstr "Ukendt fejl" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules grјn" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules brun" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules grјn" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules brun" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1180,17 +1162,24 @@ msgid "" "further assistance." msgstr "" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~F~ortryd" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~aster" @@ -1230,14 +1219,21 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "" @@ -1283,7 +1279,7 @@ 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Afslut" @@ -1985,7 +1981,7 @@ msgid "Cutscene file '%s' not found!" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 #, fuzzy msgid "Failed to load game state from file." msgstr "" @@ -1993,7 +1989,7 @@ msgstr "" "\n" "%s" -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 #, fuzzy msgid "Failed to save game state to file." msgstr "" @@ -2092,15 +2088,20 @@ msgid "" "Please (re)download it from www.scummvm.org" msgstr "" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "" @@ -2135,6 +2136,11 @@ msgstr "" msgid "This is the end of the Broken Sword 1 Demo" msgstr "" +#: engines/sword2/animation.cpp:435 +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2182,33 +2188,33 @@ msgstr "MAME OPL emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2265,11 +2271,15 @@ msgstr " (Aktiv)" msgid " (Active)" msgstr " (Aktiv)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Spil)" @@ -2349,29 +2359,29 @@ msgstr "Hјj lydkvalitet (langsommere) (genstart)" msgid "Disable power off" msgstr "Deaktiver slukning" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 #, fuzzy msgid "Mouse-click-and-drag mode enabled." msgstr "Pegeplade tilstand aktiveret." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 #, fuzzy msgid "Mouse-click-and-drag mode disabled." msgstr "Pegeplade tilstand deaktiveret." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Pegeplade tilstand aktiveret." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Pegeplade tilstand deaktiveret." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2379,12 +2389,12 @@ msgstr "" msgid "Left Click" msgstr "Venstre klik" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Midterste hјjre punkt" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2785,17 +2795,17 @@ msgstr "" "Glem ikke at tildele en tast til 'Skjul vцrktјjslinje' handling for at se " "hele oversigten" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 #, fuzzy msgid "Do you really want to return to the Launcher?" msgstr "Vil du virkelig slette denne gemmer?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 #, fuzzy msgid "Launcher" msgstr "Slag" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 #, fuzzy msgid "Do you really want to quit?" msgstr "Vil du afslutte?" @@ -2876,6 +2886,20 @@ msgstr "" msgid "Clicking Disabled" msgstr "" +#~ msgid "Hercules Green" +#~ msgstr "Hercules grјn" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules brun" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules grјn" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules brun" + #, fuzzy #~ msgid "Save game failed!" #~ msgstr "Gemmer:" diff --git a/po/de_DE.po b/po/de_DE.po index e62f81de4d..fd60d11d4a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2012-01-29 21:11+0100\n" "Last-Translator: Simon Sawatzki <SimSaw@gmx.de>\n" "Language-Team: Simon Sawatzki <SimSaw@gmx.de> (Lead), Lothar Serra Mari " "<Lothar@Windowsbase.de> (Contributor)\n" -"Language: Deutsch\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Deutsch\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: gui/about.cpp:91 @@ -45,13 +45,13 @@ msgid "Go up" msgstr "Pfad hoch" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Abbrechen" @@ -70,15 +70,15 @@ msgstr "Schlieпen" msgid "Mouse click" msgstr "Mausklick" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Tastatur anzeigen" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Tasten neu zuweisen" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Vollbild-/Fenster-Modus" @@ -91,16 +91,17 @@ msgstr "Eine Aktion zum Zuweisen auswфhlen" msgid "Map" msgstr "Zuweisen" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -128,15 +129,15 @@ msgstr "Bitte eine Aktion auswфhlen" msgid "Press the key to associate" msgstr "Taste drќcken, um sie zuzuweisen" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Spiel" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "Kennung:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -144,29 +145,29 @@ msgstr "" "Kurzer Spielname, um die Spielstфnde zuzuordnen und das Spiel von der " "Kommandozeile aus starten zu kіnnen" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Name:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Voller Name des Spiels" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Name:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Sprache:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -174,282 +175,282 @@ msgstr "" "Sprache des Spiels. Diese Funktion wird nicht eine spanische Version des " "Spiels in eine deutsche verwandeln." -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<Standard>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plattform, fќr die das Spiel ursprќnglich erstellt wurde" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Globale Grafikeinstellungen ќbergehen" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globale Grafikeinstellungen ќbergehen" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Audio" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Globale Audioeinstellungen ќbergehen" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Globale Audioeinstellungen ќbergehen" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Lautstфrke" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Lautst." -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Globale Lautstфrke-Einstellungen ќbergehen" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Globale Lautstфrkeeinstellungen ќbergehen" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Extrapfad:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Legt das Verzeichnis fќr zusфtzliche Spieldateien fest." -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Extrapfad:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Spielstфnde:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Legt fest, wo die Spielstфnde abgelegt werden." -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Speichern:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Keiner" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "SoundFont auswфhlen" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Verzeichnis mit Spieldateien auswфhlen" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Verzeichnis mit zusфtzlichen Dateien auswфhlen" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Diese Spielkennung ist schon vergeben. Bitte eine andere wфhlen." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~B~eenden" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "ScummVM beenden" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "мbe~r~" -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "мber ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~ptionen" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Globale ScummVM-Einstellungen bearbeiten" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~tarten" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Ausgewфhltes Spiel starten" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~L~aden..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Spielstand fќr ausgewфhltes Spiel laden" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "Spiel ~h~inzufќgen" -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "" "Umschalttaste (Shift) gedrќckt halten, um Verzeichnisse nach Spielen zu " "durchsuchen" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "Spielo~p~tionen" -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Spieloptionen фndern" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "Spiel ~e~ntfernen" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Spiel aus der Liste entfernen. Die Spieldateien bleiben erhalten." -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~H~inzufќgen" -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Spielo~p~tion" -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~E~ntfernen" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "In Spieleliste suchen" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Suchen:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Spiel laden:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Laden" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -457,7 +458,7 @@ msgstr "" "Mіchten Sie wirklich den PC nach Spielen durchsuchen? Mіglicherweise wird " "dabei eine grіпere Menge an Spielen hinzugefќgt." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -465,7 +466,7 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -473,37 +474,37 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM konnte das gewфhlte Verzeichnis nicht іffnen!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM konnte im gewфhlten Verzeichnis kein Spiel finden!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Spiel auswфhlen:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Mіchten Sie wirklich diese Spielkonfiguration entfernen?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "" "Fќr dieses Spiel wird das Laden aus der Spieleliste heraus nicht unterstќtzt." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM konnte keine Engine finden, um das Spiel zu starten!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Durchsuchen" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Durchsuchen" @@ -530,146 +531,146 @@ msgstr "%d Ordner durchsucht..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d neue Spiele gefunden, %d bereits hinzugefќgte Spiele ignoriert..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Niemals" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "alle 5 Minuten" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "alle 10 Minuten" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "alle 15 Minuten" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "alle 30 Minuten" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "-" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Fehler bei einigen Фnderungen in Grafikoptionen:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "Grafikmodus konnte nicht geфndert werden." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "Vollbildeinstellung konnte nicht geфndert werden." -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "" "Einstellung fќr Seitenverhфltniskorrektur konnte nicht geфndert werden." -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Grafikmodus:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Render-Modus:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "" "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt." -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Vollbildmodus" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Seitenverhфltnis korrigieren" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Antifehlerdiffusion fќr EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "" "Aktiviert die Aufhebung der Fehlerdiffusion in EGA-Spielen, die dies " "unterstќtzen." -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib-Emulator" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet." -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Ausgabefrequenz:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -677,64 +678,64 @@ msgstr "" "Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise " "nicht von jeder Soundkarte unterstќtzt." -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "GM-Gerфt:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 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:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Keine General-MIDI-Musik" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Erstes verfќgbares Gerфt" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib-/MIDI-Modus" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Benutzt MIDI und AdLib zur Sounderzeugung." -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "MIDI-Lautstфrke:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "MT-32-Gerфt:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Echte Roland-MT-32-Emulation (GM-Emulation deaktiviert)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -742,197 +743,197 @@ msgstr "" "Wфhlen Sie dies aus, wenn Sie Ihre echte Hardware, die mit einer Roland-" "kompatiblen Soundkarte verbunden ist, verwenden mіchten." -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland-MT-32-Emulation (kein GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Roland-GS-Modus" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Schaltet die General-MIDI-Zuweisung fќr Spiele mit Roland-MT-32-Audiospur " "aus." -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Keine Roland-MT-32-Musik" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Sprache und Text:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Sprache" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Untertitel" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Beides" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Untertitel-Tempo:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Sprache + Text:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Spr." -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "TXT" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "S+T" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Untertitel anzeigen und Sprachausgabe aktivieren" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Text-Tempo:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Alles aus" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Effektlautstфrke:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Lautstфrke spezieller Soundeffekte" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Effektlautst.:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Sprachlautstфrke:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Sprachlautst.:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Themenpfad:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Themenpfad:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Plugin-Pfad:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin-Pfad:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Sonstiges" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Andere" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI-Renderer:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autom. Speichern:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Speich.(auto)" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Tasten" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Sprache:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Sprache der ScummVM-Oberflфche" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Verzeichnis fќr Oberflфchen-Themen" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 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:1443 +#: gui/options.cpp:1475 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." @@ -1012,22 +1013,22 @@ msgstr "Wert lіschen" msgid "Engine does not support debug level '%s'" msgstr "Engine unterstќtzt den Debug-Level \"%s\" nicht." -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menќ" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "мberspringen" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Zeile ќberspringen" @@ -1103,25 +1104,6 @@ msgstr "Abbruch durch Benutzer" msgid "Unknown error" msgstr "Unbekannter Fehler" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules-Grќn" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules-Bernsteingelb" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules-Grќn" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules-Gelb" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1197,17 +1179,27 @@ msgstr "" "Datei fќr grundlegende Informationen und Anweisungen dazu, wie man an " "weitere Hilfe gelangt." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Leider bietet diese Engine keine Spielhilfe. Bitte lesen Sie die Liesmich-" +"Datei fќr grundlegende Informationen und Anweisungen dazu, wie man an " +"weitere Hilfe gelangt." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~bbrechen" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~asten" @@ -1258,7 +1250,17 @@ msgstr "" "Spiel hіren zu kіnnen. Lesen Sie die\n" "Liesmich-Datei fќr weitere Informationen." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Leider bietet diese Engine keine Spielhilfe. Bitte lesen Sie die Liesmich-" +"Datei fќr grundlegende Informationen und Anweisungen dazu, wie man an " +"weitere Hilfe gelangt." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1269,7 +1271,7 @@ msgstr "" "und jegliche Spielstфnde, die Sie erstellen, kіnnten in zukќnftigen " "Versionen von ScummVM nicht mehr funktionieren." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Trotzdem starten" @@ -1313,7 +1315,7 @@ msgstr "Spielen" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Beenden" @@ -2013,11 +2015,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Zwischensequenz \"%s\" nicht gefunden!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Konnte Spielstand aus Datei nicht laden." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Konnte Spielstand nicht in Datei speichern." @@ -2110,17 +2112,22 @@ msgstr "" "Bitte laden Sie diese Datei (erneut) von\n" "www.scummvm.org herunter." -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "DXA-Zwischensequenzen gefunden, aber ScummVM wurde ohne Zlib-Unterstќtzung " "erstellt." -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "MPEG2-Zwischensequenzen werden nicht mehr unterstќtzt." -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Zwischensequenz \"%s\" gefunden" @@ -2164,6 +2171,14 @@ msgstr "Den neuen behalten" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Das ist das Ende der Demo von Broken Sword 1 (Baphomets Fluch 1)." +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"DXA-Zwischensequenzen gefunden, aber ScummVM wurde ohne Zlib-Unterstќtzung " +"erstellt." + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2222,7 +2237,7 @@ msgstr "MAME-OPL-Emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox-OPL-Emulator" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2231,12 +2246,12 @@ msgstr "" "Das ausgewфhlte Audiogerфt \"%s\" wurde nicht gefunden (kіnnte " "beispielsweise ausgeschaltet oder nicht angeschlossen sein)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Es wird versucht, auf das nфchste verfќgbare Gerфt zurќckzugreifen." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2245,7 +2260,7 @@ msgstr "" "Das ausgewфhlte Audiogerфt \"%s\" kann nicht verwendet werden. Schauen Sie " "fќr weitere Informationen in der Log-Datei nach." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2254,7 +2269,7 @@ msgstr "" "Das bevorzugte Audiogerфt \"%s\" wurde nicht gefunden (kіnnte beispielsweise " "ausgeschaltet oder nicht angeschlossen sein)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2312,11 +2327,15 @@ msgstr " (Aktiv)" msgid " (Active)" msgstr " (Aktiv)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Spiel)" @@ -2396,27 +2415,27 @@ msgstr "Hohe Audioqualitфt (lansamer) (erfordert Neustart)" msgid "Disable power off" msgstr "Stromsparmodus abschalten" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Maus-klick-und-zieh-Modus aktiviert." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Maus-klick-und-zieh-Modus ausgeschaltet." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Touchpad-Modus aktiviert." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Touchpad-Modus ausgeschaltet." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2424,12 +2443,12 @@ msgstr "" msgid "Left Click" msgstr "Linksklick" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Mittlerer linker Gegenstand" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2823,15 +2842,15 @@ msgstr "" "Vergessen Sie nicht, der Aktion \"Werkzeugleiste verbergen\" eine Taste " "zuzuweisen, um das ganze Inventar sehen zu kіnnen." -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Mіchten Sie wirklich zur Spieleliste zurќckkehren?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Spieleliste" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Mіchten Sie wirklich beenden?" @@ -2905,6 +2924,20 @@ msgstr "Klicken aktiviert" msgid "Clicking Disabled" msgstr "Klicken deaktiviert" +#~ msgid "Hercules Green" +#~ msgstr "Hercules-Grќn" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules-Bernsteingelb" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules-Grќn" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules-Gelb" + #~ msgid "Save game failed!" #~ msgstr "Konnte Spielstand nicht speichern!" diff --git a/po/es_ES.po b/po/es_ES.po index 64274ceb24..c825e9de4f 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-10-23 21:53+0100\n" "Last-Translator: Tomсs Maidagan\n" "Language-Team: \n" -"Language: Espanol\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Espanol\n" #: gui/about.cpp:91 #, c-format @@ -43,13 +43,13 @@ msgid "Go up" msgstr "Arriba" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Cancelar" @@ -68,15 +68,15 @@ msgstr "Cerrar" msgid "Mouse click" msgstr "Clic de ratѓn" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Mostrar el teclado" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Asignar teclas" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Activar pantalla completa" @@ -89,16 +89,17 @@ msgstr "Elige la acciѓn a asociar" msgid "Map" msgstr "Asignar" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -126,15 +127,15 @@ msgstr "Por favor, selecciona una acciѓn" msgid "Press the key to associate" msgstr "Pulsa la tecla a asignar" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Juego" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -142,29 +143,29 @@ msgstr "" "Identificador usado para las partidas guardadas y para ejecutar el juego " "desde la lэnea de comando" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nombre:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Tэtulo completo del juego" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nom.:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Idioma:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -172,280 +173,280 @@ msgstr "" "Idioma del juego. No sirve para pasar al inglщs la versiѓn espaёola de un " "juego" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<por defecto>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plataforma:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plataforma para la que se diseёѓ el juego" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Plat.:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Ignorar opciones grсficas generales" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Opciones grсficas especэficas" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Sonido" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Ignorar opciones de sonido generales" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Opciones de sonido especэficas" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Ignorar opciones de volumen generales" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Opciones de volumen especэficas" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Ignorar opciones de MIDI generales" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Opciones de MIDI especэficas" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Ignorar opciones de MT-32 generales" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Opciones de MT-32 especэficas" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Especifica un directorio para datos adicionales del juego" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Partidas:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Especifica dѓnde guardar tus partidas" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Partidas:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Ninguna" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Por defecto" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Selecciona un SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Selecciona el directorio del juego" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Selecciona el directorio adicional" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Selecciona el directorio para partidas guardadas" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Esta ID ya estс siendo usada. Por favor, elige otra." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~S~alir" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Salir de ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "Acerca ~d~e" -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Acerca de ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~pciones..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Cambiar opciones generales de ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~J~ugar" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Jugar al juego seleccionado" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~C~argar..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Cargar partida del juego seleccionado" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~A~ёadir juego..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Mantener pulsado Mayњs para aёadir varios juegos" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~E~ditar juego..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Cambiar opciones de juego" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "E~l~iminar juego" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Eliminar el juego de la lista. Los archivos no se borran" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~ёadir..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~ditar..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "E~l~iminar" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Buscar en la lista de juegos" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Buscar:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Cargar juego:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Cargar" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -453,7 +454,7 @@ msgstr "" "ПSeguro que quieres ejecutar la detecciѓn masiva? Puede que se aёada un gran " "nњmero de juegos." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -461,7 +462,7 @@ msgstr "" msgid "Yes" msgstr "Sэ" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -469,37 +470,37 @@ msgstr "Sэ" msgid "No" msgstr "No" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ЁScummVM no ha podido abrir el directorio!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ЁScummVM no ha encontrado ningњn juego en el directorio!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Elige el juego:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "ПSeguro que quieres eliminar la configuraciѓn de este juego?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Este juego no permite cargar partidas desde el lanzador." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ЁScummVM no ha podido encontrar ningњn motor capaz de ejecutar el juego!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Aёad. varios" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Aёadir varios..." @@ -526,144 +527,144 @@ msgstr "Se ha buscado en %d directorios..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d juegos nuevos encontrados. %d juegos ignorados (ya aёadidos)..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "cada 5 minutos" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "cada 10 minutos" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "cada 15 minutos" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "cada 30 minutos" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Ninguno" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Fallo al aplicar algunos cambios en las opciones grсficas:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "no se ha podido cambiar el modo de vэdeo." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "no se ha podido cambiar el ajuste de pantalla completa" -#: gui/options.cpp:415 +#: gui/options.cpp:417 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:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Renderizado:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Modos especiales de expansiѓn soportados por algunos juegos" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Correcciѓn de aspecto" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregir relaciѓn de aspecto en juegos 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Difuminado EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Activar difuminado en los juegos EGA compatibles" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Disp. preferido:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 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:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 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:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Emul. de AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib se usa para la mњsica en muchos juegos" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Frec. de salida:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -671,64 +672,64 @@ msgstr "" "Los valores mсs altos ofrecen mayor calidad, pero puede que tu tarjeta de " "sonido no sea compatible" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Especifica el dispositivo de salida General MIDI por defecto" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "No usar mњsica General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Utilizar el primer dispositivo disponible" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont estс soportado por algunas tarjetas de sonido, ademсs de " "Fluidsynth y Timidity" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Ganancia MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Disp. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -736,191 +737,191 @@ msgstr "" "Marcar si se quiere usar un dispositivo de sonido real conectado al " "ordenador y compatible con Roland" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sin emulaciѓn GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Activar modo Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Desactiva la conversiѓn General MIDI en juegos con sonido Roland MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "No usar mњsica Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Voces" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Vel. de subtэtulos:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Reproducir voces y subtэtulos" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vel. de subt.:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Silenciar" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volumen de los efectos de sonido" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Interfaz:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Idioma:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfaz de ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Tienes que reiniciar ScummVM para que los cambios surjan efecto." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Selecciona el directorio de guardado" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Selecciona el directorio de temas" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Selecciona el directorio adicional" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Selecciona el directorio de plugins" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1002,22 +1003,22 @@ msgstr "Eliminar valor" msgid "Engine does not support debug level '%s'" msgstr "El motor no soporta el nivel de debug '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Saltar" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausar" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Saltar frase" @@ -1093,25 +1094,6 @@ msgstr "CancelЗlat per l'usuari" msgid "Unknown error" msgstr "Error desconocido" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules verde" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules сmbar" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules verde" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules сmbar" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1183,17 +1165,27 @@ msgstr "" "consulta el archivo README para encontrar informaciѓn bсsica e instrucciones " "para obtener mсs ayuda." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Lo sentimos, aњn no hay ayuda disponible para este juego. Por favor, " +"consulta el archivo README para encontrar informaciѓn bсsica e instrucciones " +"para obtener mсs ayuda." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~S~э" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~C~ancelar" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~eclas" @@ -1241,7 +1233,17 @@ msgstr "" "poder escuchar la mњsica del juego.\n" "Consulta el archivo README para mсs detalles." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Lo sentimos, aњn no hay ayuda disponible para este juego. Por favor, " +"consulta el archivo README para encontrar informaciѓn bсsica e instrucciones " +"para obtener mсs ayuda." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1251,7 +1253,7 @@ msgstr "" "ScummVM. Por lo tanto, puede que sea inestable, y que las partidas que " "guardes no funcionen en versiones futuras de ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Jugar de todos modos" @@ -1295,7 +1297,7 @@ msgstr "Jugar" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Salir" @@ -1995,11 +1997,11 @@ msgid "Cutscene file '%s' not found!" msgstr "No se ha encontrado el vэdeo '%s'" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Fallo al cargar el estado del juego desde el archivo." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Fallo al guardar el estado del juego en el archivo." @@ -2095,16 +2097,21 @@ msgstr "" "El archivo \"sky.cpt\" tiene un tamaёo incorrecto.\n" "Por favor, vuelve a bajarlo de www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Se han encontrado vэdeos DXA, pero se ha compilado ScummVM sin soporte zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Los vэdeos MPEG2 ya no son compatibles" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "No se ha encontrado el vэdeo '%s'" @@ -2148,6 +2155,13 @@ msgstr "Conservar la nueva" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Este es el final de la demo de Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"Se han encontrado vэdeos DXA, pero se ha compilado ScummVM sin soporte zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2206,7 +2220,7 @@ msgstr "Emulador OPL de MAME" msgid "DOSBox OPL emulator" msgstr "Emulador OPL de DOSBox" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2215,12 +2229,12 @@ msgstr "" "El dispositivo de sonido seleccionado, '%s', no se ha podido encontrar " "(puede estar apagado o desconectado)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Recorriendo al siguiente dispositivo disponible..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2229,7 +2243,7 @@ msgstr "" "El dispositivo de sonido seleccionado, '%s', no se puede utilizar. Consulta " "el registro para mсs informaciѓn." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2238,7 +2252,7 @@ msgstr "" "El dispositivo de sonido preferido, '%s', no se ha podido encontrar (puede " "estar apagado o desconectado)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2296,11 +2310,15 @@ msgstr "(Activa)" msgid " (Active)" msgstr "(Activa)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr "(General)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr "(Juego)" @@ -2380,27 +2398,27 @@ msgstr "Sonido de alta calidad (mсs lento) (reinicio)" msgid "Disable power off" msgstr "Desactivar apagado" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Modo clic-de-ratѓn-y-arrastrar activado." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Modo clic-de-ratѓn-y-arrastrar desactivado." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Modo Touchpad activado." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Modo Touchpad desactivado." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2408,12 +2426,12 @@ msgstr "" msgid "Left Click" msgstr "Clic izquierdo" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Objeto izquierdo del medio" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2806,15 +2824,15 @@ msgstr "" "No olvides asignar una tecla a la acciѓn 'Ocultar barra de tareas' para ver " "todo el inventario" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "ПSeguro que quieres volver al Lanzador?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Lanzador" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "ПRealmente quieres salir?" @@ -2888,5 +2906,19 @@ msgstr "Clic activado" msgid "Clicking Disabled" msgstr "Clic desactivado" +#~ msgid "Hercules Green" +#~ msgstr "Hercules verde" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules сmbar" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules verde" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules сmbar" + #~ msgid "Save game failed!" #~ msgstr "No se ha podido guardar la partida." diff --git a/po/eu.po b/po/eu.po new file mode 100644 index 0000000000..ab677fda82 --- /dev/null +++ b/po/eu.po @@ -0,0 +1,2911 @@ +# Basque translation for ScummVM. +# Copyright (C) 2011 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Mikel Iturbe Urretxa <mikel@hamahiru.org>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: ScummVM 1.5.0git\n" +"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" +"PO-Revision-Date: 2011-12-15 14:53+0100\n" +"Last-Translator: Mikel Iturbe Urretxa <mikel@hamahiru.org>\n" +"Language-Team: Librezale <librezale@librezale.org>\n" +"Language: Euskara\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gui/about.cpp:91 +#, c-format +msgid "(built on %s)" +msgstr "(%s-(e)an konpilatua)" + +#: gui/about.cpp:98 +msgid "Features compiled in:" +msgstr "Ezaugarri erantsiak:" + +#: gui/about.cpp:107 +msgid "Available engines:" +msgstr "Motore erabilgarriak:" + +#: gui/browser.cpp:66 +msgid "Go up" +msgstr "Joan gora" + +#: gui/browser.cpp:66 gui/browser.cpp:68 +msgid "Go to previous directory level" +msgstr "Igo aurreko direktorio-mailara" + +#: gui/browser.cpp:68 +msgctxt "lowres" +msgid "Go up" +msgstr "Joan gora" + +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 +#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 +#: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 +msgid "Cancel" +msgstr "Utzi" + +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +msgid "Choose" +msgstr "Aukeratu" + +#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209 +#: backends/keymapper/remap-dialog.cpp:52 +msgid "Close" +msgstr "Itxi" + +#: gui/gui-manager.cpp:118 +msgid "Mouse click" +msgstr "Sagu-klika" + +#: gui/gui-manager.cpp:122 base/main.cpp:288 +msgid "Display keyboard" +msgstr "Teklatua erakutsi" + +#: gui/gui-manager.cpp:126 base/main.cpp:292 +msgid "Remap keys" +msgstr "Teklak esleitu" + +#: gui/gui-manager.cpp:129 base/main.cpp:295 +msgid "Toggle FullScreen" +msgstr "Txandakatu pantaila osoa" + +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 +msgid "Choose an action to map" +msgstr "Aukeratu esleituko den ekintza" + +#: gui/KeysDialog.cpp:41 +msgid "Map" +msgstr "Esleitu" + +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 +#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 +#: backends/platform/wii/options.cpp:47 +#: backends/platform/wince/CELauncherDialog.cpp:54 +msgid "OK" +msgstr "Ados" + +#: gui/KeysDialog.cpp:49 +msgid "Select an action and click 'Map'" +msgstr "Aukeratu ekintza eta sakatu \"Esleitu\"" + +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 +#, c-format +msgid "Associated key : %s" +msgstr "Esleituriko tekla: %s" + +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 +#, c-format +msgid "Associated key : none" +msgstr "Esleituriko tekla: bat ere ez" + +#: gui/KeysDialog.cpp:90 +msgid "Please select an action" +msgstr "Mesedez, aukeratu ekintza bat" + +#: gui/KeysDialog.cpp:106 +msgid "Press the key to associate" +msgstr "Sakatu esleituko den tekla" + +#: gui/launcher.cpp:170 +msgid "Game" +msgstr "Jokoa" + +#: gui/launcher.cpp:174 +msgid "ID:" +msgstr "ID:" + +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 +msgid "" +"Short game identifier used for referring to savegames and running the game " +"from the command line" +msgstr "" +"Partida gordeak identifikatzeko eta jokoa komando lerrotik abiarazteko " +"erabiltzen den identifikatzailea" + +#: gui/launcher.cpp:176 +msgctxt "lowres" +msgid "ID:" +msgstr "ID:" + +#: gui/launcher.cpp:181 +msgid "Name:" +msgstr "Izena:" + +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 +msgid "Full title of the game" +msgstr "Jokoaren izen osoa" + +#: gui/launcher.cpp:183 +msgctxt "lowres" +msgid "Name:" +msgstr "Izena:" + +#: gui/launcher.cpp:187 +msgid "Language:" +msgstr "Hizkuntza:" + +#: gui/launcher.cpp:187 gui/launcher.cpp:188 +msgid "" +"Language of the game. This will not turn your Spanish game version into " +"English" +msgstr "" +"Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako" + +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 +#: audio/null.cpp:40 +msgid "<default>" +msgstr "<lehenetsia>" + +#: gui/launcher.cpp:199 +msgid "Platform:" +msgstr "Plataforma:" + +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 +msgid "Platform the game was originally designed for" +msgstr "Jatorriz, jokoa diseinatua izan zen plataforma" + +#: gui/launcher.cpp:201 +msgctxt "lowres" +msgid "Platform:" +msgstr "Plataforma:" + +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 +msgid "Graphics" +msgstr "Grafikoak" + +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 +msgid "GFX" +msgstr "GFX" + +#: gui/launcher.cpp:216 +msgid "Override global graphic settings" +msgstr "Ezarpen grafiko globalak baliogabetu" + +#: gui/launcher.cpp:218 +msgctxt "lowres" +msgid "Override global graphic settings" +msgstr "Ezarpen grafiko globalak baliogabetu" + +#: gui/launcher.cpp:225 gui/options.cpp:1110 +msgid "Audio" +msgstr "Soinua" + +#: gui/launcher.cpp:228 +msgid "Override global audio settings" +msgstr "Soinu ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:230 +msgctxt "lowres" +msgid "Override global audio settings" +msgstr "Soinu ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:239 gui/options.cpp:1115 +msgid "Volume" +msgstr "Bolumena" + +#: gui/launcher.cpp:241 gui/options.cpp:1117 +msgctxt "lowres" +msgid "Volume" +msgstr "Bolumena" + +#: gui/launcher.cpp:244 +msgid "Override global volume settings" +msgstr "Bolumen ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:246 +msgctxt "lowres" +msgid "Override global volume settings" +msgstr "Bolumen ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:254 gui/options.cpp:1125 +msgid "MIDI" +msgstr "MIDI" + +#: gui/launcher.cpp:257 +msgid "Override global MIDI settings" +msgstr "MIDI ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:259 +msgctxt "lowres" +msgid "Override global MIDI settings" +msgstr "MIDI ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:268 gui/options.cpp:1131 +msgid "MT-32" +msgstr "MT-32" + +#: gui/launcher.cpp:271 +msgid "Override global MT-32 settings" +msgstr "MT-32 ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:273 +msgctxt "lowres" +msgid "Override global MT-32 settings" +msgstr "MT-32 ezarpen globalak baliogabetu" + +#: gui/launcher.cpp:282 gui/options.cpp:1138 +msgid "Paths" +msgstr "Bide-izenak" + +#: gui/launcher.cpp:284 gui/options.cpp:1140 +msgctxt "lowres" +msgid "Paths" +msgstr "Bideak" + +#: gui/launcher.cpp:291 +msgid "Game Path:" +msgstr "Jokoa:" + +#: gui/launcher.cpp:293 +msgctxt "lowres" +msgid "Game Path:" +msgstr "Jokoa:" + +#: gui/launcher.cpp:298 gui/options.cpp:1164 +msgid "Extra Path:" +msgstr "Gehigarriak:" + +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 +msgid "Specifies path to additional data used the game" +msgstr "Jokoak erabiltzen duen datu gehigarrien bide-izena" + +#: gui/launcher.cpp:300 gui/options.cpp:1166 +msgctxt "lowres" +msgid "Extra Path:" +msgstr "Gehigarria:" + +#: gui/launcher.cpp:307 gui/options.cpp:1148 +msgid "Save Path:" +msgstr "Partida gordeak:" + +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +msgid "Specifies where your savegames are put" +msgstr "Zure gordetako partidak non gordeko diren zehazten du" + +#: gui/launcher.cpp:309 gui/options.cpp:1150 +msgctxt "lowres" +msgid "Save Path:" +msgstr "Partida gordeak:" + +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 +msgctxt "path" +msgid "None" +msgstr "Bat ere ez" + +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 +#: backends/platform/wii/options.cpp:56 +msgid "Default" +msgstr "Lehenetsia" + +#: gui/launcher.cpp:462 gui/options.cpp:1442 +msgid "Select SoundFont" +msgstr "SoundFont-a aukeratu" + +#: gui/launcher.cpp:481 gui/launcher.cpp:636 +msgid "Select directory with game data" +msgstr "Jokoaren direktorioa aukeratu" + +#: gui/launcher.cpp:499 +msgid "Select additional game directory" +msgstr "Direktorio gehigarria aukeratu" + +#: gui/launcher.cpp:511 +msgid "Select directory for saved games" +msgstr "Partida gordeen direktorioa aukeratu" + +#: gui/launcher.cpp:538 +msgid "This game ID is already taken. Please choose another one." +msgstr "ID hau jada erabilia izaten ari da. Mesedez, aukeratu beste bat." + +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 +msgid "~Q~uit" +msgstr "~I~rten" + +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 +msgid "Quit ScummVM" +msgstr "Irten ScummVM-tik" + +#: gui/launcher.cpp:580 +msgid "A~b~out..." +msgstr "Ho~n~i buruz..." + +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 +msgid "About ScummVM" +msgstr "ScummVM-i buruz" + +#: gui/launcher.cpp:581 +msgid "~O~ptions..." +msgstr "~A~ukerak" + +#: gui/launcher.cpp:581 +msgid "Change global ScummVM options" +msgstr "ScummVM-ren aukera globalak aldatu" + +#: gui/launcher.cpp:583 +msgid "~S~tart" +msgstr "~H~asi" + +#: gui/launcher.cpp:583 +msgid "Start selected game" +msgstr "Aukeraturiko jokora jolastu" + +#: gui/launcher.cpp:586 +msgid "~L~oad..." +msgstr "~K~argatu" + +#: gui/launcher.cpp:586 +msgid "Load savegame for selected game" +msgstr "Aukeraturiko jokorako partida gordea kargatu" + +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 +msgid "~A~dd Game..." +msgstr "~G~ehitu..." + +#: gui/launcher.cpp:591 gui/launcher.cpp:598 +msgid "Hold Shift for Mass Add" +msgstr "Shift mantendu sakaturik hainbat joko gehitzeko" + +#: gui/launcher.cpp:593 +msgid "~E~dit Game..." +msgstr "~E~ditatu..." + +#: gui/launcher.cpp:593 gui/launcher.cpp:600 +msgid "Change game options" +msgstr "Aldatu jokoaren aukerak" + +#: gui/launcher.cpp:595 +msgid "~R~emove Game" +msgstr "~K~endu jokoa" + +#: gui/launcher.cpp:595 gui/launcher.cpp:602 +msgid "Remove game from the list. The game data files stay intact" +msgstr "Jokoa zerrendatik kendu. Jokoaren fitxategiak ez dira ezabatzen" + +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 +msgctxt "lowres" +msgid "~A~dd Game..." +msgstr "~G~ehitu..." + +#: gui/launcher.cpp:600 +msgctxt "lowres" +msgid "~E~dit Game..." +msgstr "~E~ditatu..." + +#: gui/launcher.cpp:602 +msgctxt "lowres" +msgid "~R~emove Game" +msgstr "~K~endu" + +#: gui/launcher.cpp:610 +msgid "Search in game list" +msgstr "Bilatu joko-zerrendan" + +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 +msgid "Search:" +msgstr "Bilatu:" + +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 +msgid "Load game:" +msgstr "Jokoa kargatu:" + +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 +#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 +#: backends/platform/wince/CEActionsSmartphone.cpp:231 +msgid "Load" +msgstr "Kargatu" + +#: gui/launcher.cpp:747 +msgid "" +"Do you really want to run the mass game detector? This could potentially add " +"a huge number of games." +msgstr "" +"Joko detektatzaile masiboa exekutatu nahi al duzu? Honek joko kantitate " +"handia gehitu dezake." + +#: gui/launcher.cpp:748 gui/launcher.cpp:896 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:326 +#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CELauncherDialog.cpp:83 +msgid "Yes" +msgstr "Bai" + +#: gui/launcher.cpp:748 gui/launcher.cpp:896 +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +#: backends/platform/wince/CEActionsPocket.cpp:326 +#: backends/platform/wince/CEActionsSmartphone.cpp:287 +#: backends/platform/wince/CELauncherDialog.cpp:83 +msgid "No" +msgstr "Ez" + +#: gui/launcher.cpp:796 +msgid "ScummVM couldn't open the specified directory!" +msgstr "ScummVM-k ezin izan du zehazturiko direktorioa ireki!" + +#: gui/launcher.cpp:808 +msgid "ScummVM could not find any game in the specified directory!" +msgstr "ScummVM-k ezin izan du jokorik aurkitu zehazturiko direktorioan!" + +#: gui/launcher.cpp:822 +msgid "Pick the game:" +msgstr "Jokoa aukeratu:" + +#: gui/launcher.cpp:896 +msgid "Do you really want to remove this game configuration?" +msgstr "Benetan ezabatu nahi duzu joko-konfigurazio hau?" + +#: gui/launcher.cpp:960 +msgid "This game does not support loading games from the launcher." +msgstr "Joko honek ez du uzten partidak abiarazletik kargatzen." + +#: gui/launcher.cpp:964 +msgid "ScummVM could not find any engine capable of running the selected game!" +msgstr "" +"ScummVM-k ezin izan du aukeraturiko jokoa exekutatzeko gai den motorerik " +"aurkitu!" + +#: gui/launcher.cpp:1078 +msgctxt "lowres" +msgid "Mass Add..." +msgstr "Hainbat gehitu..." + +#: gui/launcher.cpp:1078 +msgid "Mass Add..." +msgstr "Hainbat gehitu..." + +#: gui/massadd.cpp:78 gui/massadd.cpp:81 +msgid "... progress ..." +msgstr "... aurrerapena ..." + +#: gui/massadd.cpp:258 +msgid "Scan complete!" +msgstr "Bilaketa amaitua!" + +#: gui/massadd.cpp:261 +#, c-format +msgid "Discovered %d new games, ignored %d previously added games." +msgstr "" +"%d joko berri aurkitu dira, aurretik gehituriko %d ez dira kontuan hartu" + +#: gui/massadd.cpp:265 +#, c-format +msgid "Scanned %d directories ..." +msgstr "%d direktorio eskaneatu dira ..." + +#: gui/massadd.cpp:268 +#, c-format +msgid "Discovered %d new games, ignored %d previously added games ..." +msgstr "" +"%d joko berri aurkitu dira, aurretik gehituriko %d ez dira kontuan hartu" + +#: gui/options.cpp:78 +msgid "Never" +msgstr "Inoiz ez" + +#: gui/options.cpp:78 +msgid "every 5 mins" +msgstr "5 minuturo" + +#: gui/options.cpp:78 +msgid "every 10 mins" +msgstr "10 minuturo" + +#: gui/options.cpp:78 +msgid "every 15 mins" +msgstr "15 minuturo" + +#: gui/options.cpp:78 +msgid "every 30 mins" +msgstr "30 minuturo" + +#: gui/options.cpp:80 +msgid "8 kHz" +msgstr "8 kHz" + +#: gui/options.cpp:80 +msgid "11kHz" +msgstr "11kHz" + +#: gui/options.cpp:80 +msgid "22 kHz" +msgstr "22 kHz" + +#: gui/options.cpp:80 +msgid "44 kHz" +msgstr "44 kHz" + +#: gui/options.cpp:80 +msgid "48 kHz" +msgstr "48 kHz" + +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 +msgctxt "soundfont" +msgid "None" +msgstr "Bat ere ez" + +#: gui/options.cpp:393 +msgid "Failed to apply some of the graphic options changes:" +msgstr "Ezin izan da grafikoen aukeretako batzuk aplikatu:" + +#: gui/options.cpp:405 +msgid "the video mode could not be changed." +msgstr "ezin izan da bideo-modua aldatu." + +#: gui/options.cpp:411 +msgid "the fullscreen setting could not be changed" +msgstr "ezin izan da pantaila-osoaren ezarpena aldatu" + +#: gui/options.cpp:417 +msgid "the aspect ratio setting could not be changed" +msgstr "formatu-ratioaren ezarpena ezin izan da aldatu" + +#: gui/options.cpp:742 +msgid "Graphics mode:" +msgstr "Modu grafikoa:" + +#: gui/options.cpp:756 +msgid "Render mode:" +msgstr "Renderizazioa:" + +#: gui/options.cpp:756 gui/options.cpp:757 +msgid "Special dithering modes supported by some games" +msgstr "Joko batzuk onarturiko lausotze-modu bereziak" + +#: gui/options.cpp:768 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 +msgid "Fullscreen mode" +msgstr "Pantaila osoa" + +#: gui/options.cpp:771 +msgid "Aspect ratio correction" +msgstr "Formatu-ratioaren zuzenketa" + +#: gui/options.cpp:771 +msgid "Correct aspect ratio for 320x200 games" +msgstr "320x200 jokoentzako formatu-ratioa zuzendu" + +#: gui/options.cpp:772 +msgid "EGA undithering" +msgstr "EGA lausotzea" + +#: gui/options.cpp:772 +msgid "Enable undithering in EGA games that support it" +msgstr "EGA lausotzea gaitu joko bateragarrietan" + +#: gui/options.cpp:780 +msgid "Preferred Device:" +msgstr "Gogoko gailua:" + +#: gui/options.cpp:780 +msgid "Music Device:" +msgstr "Musika gailua:" + +#: gui/options.cpp:780 gui/options.cpp:782 +msgid "Specifies preferred sound device or sound card emulator" +msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du" + +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 +msgid "Specifies output sound device or sound card emulator" +msgstr "Irteerako soinu txartel edo emuladorea ezartzen du" + +#: gui/options.cpp:782 +msgctxt "lowres" +msgid "Preferred Dev.:" +msgstr "Gail. gogokoa:" + +#: gui/options.cpp:782 +msgctxt "lowres" +msgid "Music Device:" +msgstr "Musika gailua:" + +#: gui/options.cpp:809 +msgid "AdLib emulator:" +msgstr "AdLib emuladorea:" + +#: gui/options.cpp:809 gui/options.cpp:810 +msgid "AdLib is used for music in many games" +msgstr "AdLib musikarako hainbat jokotan erabiltzen da" + +#: gui/options.cpp:820 +msgid "Output rate:" +msgstr "Irteera maizt.:" + +#: gui/options.cpp:820 gui/options.cpp:821 +msgid "" +"Higher value specifies better sound quality but may be not supported by your " +"soundcard" +msgstr "" +"Balio altuagoek soinu kalitate hobea ezartzen dute, baina baliteke zure " +"soinu-txartela bateragarria ez izatea" + +#: gui/options.cpp:831 +msgid "GM Device:" +msgstr "GM gailua:" + +#: gui/options.cpp:831 +msgid "Specifies default sound device for General MIDI output" +msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako" + +#: gui/options.cpp:842 +msgid "Don't use General MIDI music" +msgstr "Ez erabili General MIDI musika" + +#: gui/options.cpp:853 gui/options.cpp:915 +msgid "Use first available device" +msgstr "Erabilgarri dagoen lehen gailua erabili" + +#: gui/options.cpp:865 +msgid "SoundFont:" +msgstr "SoundFont:" + +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 +msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" +msgstr "" +"Zenbait soinu txartel bateragarriak dira SoundFont-ekin, Fluidsynth eta " +"Timidity besteak beste" + +#: gui/options.cpp:867 +msgctxt "lowres" +msgid "SoundFont:" +msgstr "SoundFont:" + +#: gui/options.cpp:873 +msgid "Mixed AdLib/MIDI mode" +msgstr "AdLib/MIDI modua" + +#: gui/options.cpp:873 +msgid "Use both MIDI and AdLib sound generation" +msgstr "Soinua sortzerakoan MIDI eta AdLib erabili" + +#: gui/options.cpp:876 +msgid "MIDI gain:" +msgstr "MIDI irabazia:" + +#: gui/options.cpp:886 +msgid "MT-32 Device:" +msgstr "MT-32 gailua:" + +#: gui/options.cpp:886 +msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" +msgstr "" +"Roland MT-32/LAPC1/CM32l/CM64 irteerarako defektuzko soinu txartela ezartzen " +"du" + +#: gui/options.cpp:891 +msgid "True Roland MT-32 (disable GM emulation)" +msgstr "Benetako Roland MT-32 (GM emulazio gabe)" + +#: gui/options.cpp:891 gui/options.cpp:893 +msgid "" +"Check if you want to use your real hardware Roland-compatible sound device " +"connected to your computer" +msgstr "" +"Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-" +"gailua erabiltzeko" + +#: gui/options.cpp:893 +msgctxt "lowres" +msgid "True Roland MT-32 (no GM emulation)" +msgstr "Benetako Roland MT-32 (GM emulazio gabe)" + +#: gui/options.cpp:896 +msgid "Enable Roland GS Mode" +msgstr "Roland GS modua gaitu" + +#: gui/options.cpp:896 +msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" +msgstr "" +"Roland MT-32 soinua duten jokoetan General MIDI bihurtzea desgaitzen du" + +#: gui/options.cpp:905 +msgid "Don't use Roland MT-32 music" +msgstr "Ez erabili Roland MT-32 musika" + +#: gui/options.cpp:932 +msgid "Text and Speech:" +msgstr "Testu eta ahotsa:" + +#: gui/options.cpp:936 gui/options.cpp:946 +msgid "Speech" +msgstr "Ahotsa" + +#: gui/options.cpp:937 gui/options.cpp:947 +msgid "Subtitles" +msgstr "Azpitituluak" + +#: gui/options.cpp:938 +msgid "Both" +msgstr "Biak" + +#: gui/options.cpp:940 +msgid "Subtitle speed:" +msgstr "Azpitit. abiadura:" + +#: gui/options.cpp:942 +msgctxt "lowres" +msgid "Text and Speech:" +msgstr "Testu eta ahotsa:" + +#: gui/options.cpp:946 +msgid "Spch" +msgstr "Ahots." + +#: gui/options.cpp:947 +msgid "Subs" +msgstr "Azp." + +#: gui/options.cpp:948 +msgctxt "lowres" +msgid "Both" +msgstr "Biak" + +#: gui/options.cpp:948 +msgid "Show subtitles and play speech" +msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi" + +#: gui/options.cpp:950 +msgctxt "lowres" +msgid "Subtitle speed:" +msgstr "Azpit. abiadura:" + +#: gui/options.cpp:966 +msgid "Music volume:" +msgstr "Musika:" + +#: gui/options.cpp:968 +msgctxt "lowres" +msgid "Music volume:" +msgstr "Musika:" + +#: gui/options.cpp:975 +msgid "Mute All" +msgstr "Mututu dena" + +#: gui/options.cpp:978 +msgid "SFX volume:" +msgstr "Efektuak:" + +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 +msgid "Special sound effects volume" +msgstr "Soinu efektu berezien bolumena" + +#: gui/options.cpp:980 +msgctxt "lowres" +msgid "SFX volume:" +msgstr "Efektuak:" + +#: gui/options.cpp:988 +msgid "Speech volume:" +msgstr "Ahotsak:" + +#: gui/options.cpp:990 +msgctxt "lowres" +msgid "Speech volume:" +msgstr "Ahotsak:" + +#: gui/options.cpp:1156 +msgid "Theme Path:" +msgstr "Gaiak:" + +#: gui/options.cpp:1158 +msgctxt "lowres" +msgid "Theme Path:" +msgstr "Gaiak:" + +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 +msgid "Specifies path to additional data used by all games or ScummVM" +msgstr "" +"Joko guztiek edo ScummVM-k darabilten datu gehigarrien bide-izena ezartzen du" + +#: gui/options.cpp:1173 +msgid "Plugins Path:" +msgstr "Pluginak:" + +#: gui/options.cpp:1175 +msgctxt "lowres" +msgid "Plugins Path:" +msgstr "Pluginak:" + +#: gui/options.cpp:1184 +msgid "Misc" +msgstr "Beste" + +#: gui/options.cpp:1186 +msgctxt "lowres" +msgid "Misc" +msgstr "Beste" + +#: gui/options.cpp:1188 +msgid "Theme:" +msgstr "Gaia:" + +#: gui/options.cpp:1192 +msgid "GUI Renderer:" +msgstr "Interfazea:" + +#: gui/options.cpp:1204 +msgid "Autosave:" +msgstr "Autogordetzea:" + +#: gui/options.cpp:1206 +msgctxt "lowres" +msgid "Autosave:" +msgstr "Autogordetzea:" + +#: gui/options.cpp:1214 +msgid "Keys" +msgstr "Teklak" + +#: gui/options.cpp:1221 +msgid "GUI Language:" +msgstr "Hizkuntza" + +#: gui/options.cpp:1221 +msgid "Language of ScummVM GUI" +msgstr "ScummVM interfazearen hizkuntza" + +#: gui/options.cpp:1372 +msgid "You have to restart ScummVM before your changes will take effect." +msgstr "ScummVM berrabiarazi behar duzu aldaketak indarrean jartzeko" + +#: gui/options.cpp:1385 +msgid "Select directory for savegames" +msgstr "Gordetako partiden direktorioa aukeratu" + +#: gui/options.cpp:1392 +msgid "The chosen directory cannot be written to. Please select another one." +msgstr "Aukeraturiko direktorioan ezin da idatzi. Mesedez, aukeratu beste bat." + +#: gui/options.cpp:1401 +msgid "Select directory for GUI themes" +msgstr "Gaien direktorioa aukeratu" + +#: gui/options.cpp:1411 +msgid "Select directory for extra files" +msgstr "Fitxategi gehigarrien direktorioa aukeratu" + +#: gui/options.cpp:1422 +msgid "Select directory for plugins" +msgstr "Pluginen direktorioa aukeratu" + +#: gui/options.cpp:1475 +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 "" +"Aukeraturiko gaia ez da zure hizkuntzarekin bateragarria. Gai hau erabili " +"nahi baduzu, aurretik beste hizkuntza batera pasa behar duzu." + +#: gui/saveload.cpp:58 gui/saveload.cpp:239 +msgid "No date saved" +msgstr "Ez dago datarik gordeta" + +#: gui/saveload.cpp:59 gui/saveload.cpp:240 +msgid "No time saved" +msgstr "Ez dago ordurik gordeta" + +#: gui/saveload.cpp:60 gui/saveload.cpp:241 +msgid "No playtime saved" +msgstr "Ez dago denborarik gordeta" + +#: gui/saveload.cpp:67 gui/saveload.cpp:155 +msgid "Delete" +msgstr "Ezabatu" + +#: gui/saveload.cpp:154 +msgid "Do you really want to delete this savegame?" +msgstr "Ezabatu partida gorde hau?" + +#: gui/saveload.cpp:264 +msgid "Date: " +msgstr "Data:" + +#: gui/saveload.cpp:268 +msgid "Time: " +msgstr "Ordua" + +#: gui/saveload.cpp:274 +msgid "Playtime: " +msgstr "Denbora:" + +#: gui/saveload.cpp:287 gui/saveload.cpp:354 +msgid "Untitled savestate" +msgstr "Titulurik gabeko partida" + +#: gui/themebrowser.cpp:44 +msgid "Select a Theme" +msgstr "Gaia aukeratu" + +#: gui/ThemeEngine.cpp:333 +msgid "Disabled GFX" +msgstr "GFX desgaituta" + +#: gui/ThemeEngine.cpp:333 +msgctxt "lowres" +msgid "Disabled GFX" +msgstr "GFX desgaituta" + +#: gui/ThemeEngine.cpp:334 +msgid "Standard Renderer (16bpp)" +msgstr "Estandarra (16bpp)" + +#: gui/ThemeEngine.cpp:334 +msgid "Standard (16bpp)" +msgstr "Estandarra (16bpp)" + +#: gui/ThemeEngine.cpp:336 +msgid "Antialiased Renderer (16bpp)" +msgstr "Lausotua (16bpp)" + +#: gui/ThemeEngine.cpp:336 +msgid "Antialiased (16bpp)" +msgstr "Lausotua (16bpp)" + +#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322 +msgid "Clear value" +msgstr "Balioa kendu:" + +#: base/main.cpp:203 +#, c-format +msgid "Engine does not support debug level '%s'" +msgstr "Motoreak ez da '%s' debug mailarekin bateragarria" + +#: base/main.cpp:275 +msgid "Menu" +msgstr "Menua" + +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 +#: backends/platform/wince/CEActionsPocket.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:46 +msgid "Skip" +msgstr "Saltatu" + +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 +#: backends/platform/wince/CEActionsPocket.cpp:42 +msgid "Pause" +msgstr "Gelditu" + +#: base/main.cpp:284 +msgid "Skip line" +msgstr "Lerroa saltatu" + +#: base/main.cpp:455 +msgid "Error running game:" +msgstr "Jokoa exekutatzean errorea:" + +#: base/main.cpp:479 +msgid "Could not find any engine capable of running the selected game" +msgstr "Ezin izan da aukeraturiko jokoa exekutatzeko gai den motorerik aurkitu" + +#: common/error.cpp:38 +msgid "No error" +msgstr "Errorerik ez" + +#: common/error.cpp:40 +msgid "Game data not found" +msgstr "Jokoaren datuak ez dira aurkitu" + +#: common/error.cpp:42 +msgid "Game id not supported" +msgstr "Jokoaren ID ez-onartua" + +#: common/error.cpp:44 +msgid "Unsupported color mode" +msgstr "Kolore modu ez-onartua" + +#: common/error.cpp:47 +msgid "Read permission denied" +msgstr "Irakurketa baimena ukatua" + +#: common/error.cpp:49 +msgid "Write permission denied" +msgstr "Idazketa baimena ukatua" + +#: common/error.cpp:52 +msgid "Path does not exist" +msgstr "Bide-izena ez da existitzen" + +#: common/error.cpp:54 +msgid "Path not a directory" +msgstr "Bide-izena ez da direktorioa" + +#: common/error.cpp:56 +msgid "Path not a file" +msgstr "Bide-izena ez da fitxategia" + +#: common/error.cpp:59 +msgid "Cannot create file" +msgstr "Fitxategia ezin da sortu" + +#: common/error.cpp:61 +msgid "Reading data failed" +msgstr "Errorea irakurtzean" + +#: common/error.cpp:63 +msgid "Writing data failed" +msgstr "Errorea idaztean" + +#: common/error.cpp:66 +msgid "Could not find suitable engine plugin" +msgstr "Ezin izan da motore-plugin egokirik aurkitu" + +#: common/error.cpp:68 +msgid "Engine plugin does not support save states" +msgstr "Motore-pluginak ez ditu gordetako partidak onartzen" + +#: common/error.cpp:71 +msgid "User canceled" +msgstr "Erabiltzaileak utzia" + +#: common/error.cpp:75 +msgid "Unknown error" +msgstr "Errore ezezaguna" + +#: engines/advancedDetector.cpp:296 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "'%s'-(e)ko jokoa ezezaguna dela dirudi" + +#: engines/advancedDetector.cpp:297 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "Mesedez, bidali hurrengo datuak ScummVM taldeari gehitzen saiatu zaren" + +#: engines/advancedDetector.cpp:299 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "jokoaren izen, bertsio/hizkuntza/e.a.-ekin batera:" + +#: engines/dialogs.cpp:84 +msgid "~R~esume" +msgstr "~J~arraitu" + +#: engines/dialogs.cpp:86 +msgid "~L~oad" +msgstr "Ka~r~gatu" + +#: engines/dialogs.cpp:90 +msgid "~S~ave" +msgstr "~G~orde" + +#: engines/dialogs.cpp:94 +msgid "~O~ptions" +msgstr "~A~ukerak" + +#: engines/dialogs.cpp:99 +msgid "~H~elp" +msgstr "~L~aguntza" + +#: engines/dialogs.cpp:101 +msgid "~A~bout" +msgstr "Ho~n~i buruz" + +#: engines/dialogs.cpp:104 engines/dialogs.cpp:182 +msgid "~R~eturn to Launcher" +msgstr "It~z~uli abiarazlera" + +#: engines/dialogs.cpp:106 engines/dialogs.cpp:184 +msgctxt "lowres" +msgid "~R~eturn to Launcher" +msgstr "It~z~uli abiarazlera" + +#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214 +#: engines/sci/engine/kfile.cpp:566 +msgid "Save game:" +msgstr "Gorde jokoa:" + +#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566 +#: backends/platform/symbian/src/SymbianActions.cpp:44 +#: backends/platform/wince/CEActionsPocket.cpp:43 +#: backends/platform/wince/CEActionsPocket.cpp:267 +#: backends/platform/wince/CEActionsSmartphone.cpp:45 +#: backends/platform/wince/CEActionsSmartphone.cpp:231 +msgid "Save" +msgstr "Gorde" + +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" +"Barkatu, motore honek ez du joko barruan laguntzarik eskaintzen. Jo ezazu " +"README-ra oinarrizko informaziorako eta laguntza gehiago nola jaso jakiteko." + +#: engines/dialogs.cpp:243 +#, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Jokoaren egoera gordetzeak huts egin du (%s)! Jo ezazu README-ra oinarrizko " +"informaziorako eta laguntza gehiago nola jaso jakiteko." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 +#: engines/mohawk/dialogs.cpp:174 +msgid "~O~K" +msgstr "~A~dos" + +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 +#: engines/mohawk/dialogs.cpp:175 +msgid "~C~ancel" +msgstr "~U~tzi" + +#: engines/dialogs.cpp:325 +msgid "~K~eys" +msgstr "~T~eklak" + +#: engines/engine.cpp:235 +msgid "Could not initialize color format." +msgstr "Kolore formatua ezin izan da hasieratu." + +#: engines/engine.cpp:243 +msgid "Could not switch to video mode: '" +msgstr "Ezin izan da aldatu bideo modura : '" + +#: engines/engine.cpp:252 +msgid "Could not apply aspect ratio setting." +msgstr "Ezin izan da formatu-ratio ezarpena aplikatu." + +#: engines/engine.cpp:257 +msgid "Could not apply fullscreen setting." +msgstr "Ezin izan da pantaila-osoa ezarpena aplikatu." + +#: engines/engine.cpp:357 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" +"Joko honetara zuzenean CD-tik jolasten\n" +"zaudela ematen du. Jakina da honek arazoak\n" +"sortzen dituela eta beraz gomendagarria da\n" +"fitxategiak disko gogorrera kopiatzea.\n" +"Jo README fitxategira xehetasunetarako." + +#: engines/engine.cpp:368 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" +"Joko honek bere diskoan audio pistak ditu.\n" +"Pista hauek diskotik erauzi behar dira erauzle\n" +"egoki bat erabiliz, jokoko musika entzun ahal\n" +"izateko. Jo README fitxategira\n" +"xehetasunetarako." + +#: engines/engine.cpp:426 +#, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Jokoaren egoera kargatzeak huts egin du (%s)! Jo ezazu README-ra oinarrizko " +"informaziorako eta laguntza gehiago nola jaso jakiteko." + +#: engines/engine.cpp:439 +msgid "" +"WARNING: The game you are about to start is not yet fully supported by " +"ScummVM. As such, it is likely to be unstable, and any saves you make might " +"not work in future versions of ScummVM." +msgstr "" +"ABISUA: ScummVM-k ez du guztiz onartzen exekutatuko duzun jokoa oraindik. " +"Hori dela eta, ezegonkorra izan daiteke eta gerta daiteke gordeta izan " +"ditzakezun partidan ez ibiltzea ScummVM-ren etorkizuneko bertsioetan." + +#: engines/engine.cpp:442 +msgid "Start anyway" +msgstr "Jolastu berdin-berdin" + +#: engines/scumm/dialogs.cpp:175 +#, c-format +msgid "Insert Disk %c and Press Button to Continue." +msgstr "%c diskoa sartu eta sakatu botoi bat jarraitzeko." + +#: engines/scumm/dialogs.cpp:176 +#, c-format +msgid "Unable to Find %s, (%c%d) Press Button." +msgstr "Ezin izan da %s, (%c%d) aurkitu. Sakatu botoi bat" + +#: engines/scumm/dialogs.cpp:177 +#, c-format +msgid "Error reading disk %c, (%c%d) Press Button." +msgstr "%c, (%c%d) diskoa irakurtzean errorea. Sakatu botoia." + +#: engines/scumm/dialogs.cpp:178 +msgid "Game Paused. Press SPACE to Continue." +msgstr "Joko pausatua. Sakatu ZURIUNEA jarraitzeko." + +#. I18N: You may specify 'Yes' symbol at the end of the line, like this: +#. "Moechten Sie wirklich neu starten? (J/N)J" +#. Will react to J as 'Yes' +#: engines/scumm/dialogs.cpp:182 +msgid "Are you sure you want to restart? (Y/N)" +msgstr "Ziur zaude berrabiarazi nahi duzula (B/E)B" + +#. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment +#: engines/scumm/dialogs.cpp:184 +msgid "Are you sure you want to quit? (Y/N)" +msgstr "Ziur zaude irten nahi duzula? (B/E)B" + +#: engines/scumm/dialogs.cpp:189 +msgid "Play" +msgstr "Jolastu" + +#: engines/scumm/dialogs.cpp:191 engines/scumm/help.cpp:82 +#: engines/scumm/help.cpp:84 +#: backends/platform/symbian/src/SymbianActions.cpp:52 +#: backends/platform/wince/CEActionsPocket.cpp:44 +#: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:213 +msgid "Quit" +msgstr "Irten" + +#: engines/scumm/dialogs.cpp:193 +msgid "Insert save/load game disk" +msgstr "Sartu partida gordeak dituen diskoa" + +#: engines/scumm/dialogs.cpp:194 +msgid "You must enter a name" +msgstr "Izen bat sartu behar duzu" + +#: engines/scumm/dialogs.cpp:195 +msgid "The game was NOT saved (disk full?)" +msgstr "Jokoa EZ da gorde (diskoa beteta?)" + +#: engines/scumm/dialogs.cpp:196 +msgid "The game was NOT loaded" +msgstr "Jokoa EZ da kargatu" + +#: engines/scumm/dialogs.cpp:197 +#, c-format +msgid "Saving '%s'" +msgstr "'%s' gordetzen" + +#: engines/scumm/dialogs.cpp:198 +#, c-format +msgid "Loading '%s'" +msgstr "'%s' kargatzen" + +#: engines/scumm/dialogs.cpp:199 +msgid "Name your SAVE game" +msgstr "Izendatu zure partida" + +#: engines/scumm/dialogs.cpp:200 +msgid "Select a game to LOAD" +msgstr "Aukeratu kargatzeko partida" + +#: engines/scumm/dialogs.cpp:201 +msgid "Game title)" +msgstr "Jokoaren izena)" + +#. I18N: Previous page button +#: engines/scumm/dialogs.cpp:287 +msgid "~P~revious" +msgstr "~A~urrekoa" + +#. I18N: Next page button +#: engines/scumm/dialogs.cpp:289 +msgid "~N~ext" +msgstr "~H~urrengoa" + +#: engines/scumm/dialogs.cpp:290 +#: backends/platform/ds/arm9/source/dsoptions.cpp:56 +msgid "~C~lose" +msgstr "~I~txi" + +#: engines/scumm/dialogs.cpp:597 +msgid "Speech Only" +msgstr "Ahotsak bakarrik" + +#: engines/scumm/dialogs.cpp:598 +msgid "Speech and Subtitles" +msgstr "Ahotsak eta azpitituluak" + +#: engines/scumm/dialogs.cpp:599 +msgid "Subtitles Only" +msgstr "Azpitituluak bakarrik" + +#: engines/scumm/dialogs.cpp:607 +msgctxt "lowres" +msgid "Speech & Subs" +msgstr "Ahotsak & azpit." + +#: engines/scumm/dialogs.cpp:653 +msgid "Select a Proficiency Level." +msgstr "Zailtasuna aukeratu." + +#: engines/scumm/dialogs.cpp:655 +msgid "Refer to your Loom(TM) manual for help." +msgstr "Loom(TM)-ko eskuliburura jo ezazu laguntza lortzeko." + +#: engines/scumm/dialogs.cpp:658 +msgid "Standard" +msgstr "Estandarra" + +#: engines/scumm/dialogs.cpp:659 +msgid "Practice" +msgstr "Entrenamendua" + +#: engines/scumm/dialogs.cpp:660 +msgid "Expert" +msgstr "Aditua" + +#: engines/scumm/help.cpp:73 +msgid "Common keyboard commands:" +msgstr "Teklatuko komando oinarrizkoak:" + +#: engines/scumm/help.cpp:74 +msgid "Save / Load dialog" +msgstr "Gorde / Kargatu pantaila" + +#: engines/scumm/help.cpp:76 +msgid "Skip line of text" +msgstr "Esaldia saltatu" + +#: engines/scumm/help.cpp:77 +msgid "Esc" +msgstr "Ihes" + +#: engines/scumm/help.cpp:77 +msgid "Skip cutscene" +msgstr "Eszena saltatu" + +#: engines/scumm/help.cpp:78 +msgid "Space" +msgstr "Zuriunea" + +#: engines/scumm/help.cpp:78 +msgid "Pause game" +msgstr "Jokoa pausatu" + +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 +msgid "Ctrl" +msgstr "Ktrl" + +#: engines/scumm/help.cpp:79 +msgid "Load game state 1-10" +msgstr "1-10 jokoa kargatu" + +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 +msgid "Alt" +msgstr "Alt" + +#: engines/scumm/help.cpp:80 +msgid "Save game state 1-10" +msgstr "1-10 partida gorde" + +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 +msgid "Enter" +msgstr "Sartu" + +#: engines/scumm/help.cpp:86 +msgid "Toggle fullscreen" +msgstr "Pantaila osoa jarri / kendu" + +#: engines/scumm/help.cpp:87 +msgid "Music volume up / down" +msgstr "Musikaren bolumena gora / behera" + +#: engines/scumm/help.cpp:88 +msgid "Text speed slower / faster" +msgstr "Testu-abiadura astiroago / bizkorrago" + +#: engines/scumm/help.cpp:89 +msgid "Simulate left mouse button" +msgstr "Saguaren ezker botoia simulatu" + +#: engines/scumm/help.cpp:90 +msgid "Tab" +msgstr "Tab" + +#: engines/scumm/help.cpp:90 +msgid "Simulate right mouse button" +msgstr "Saguaren eskuin botoia simulatu" + +#: engines/scumm/help.cpp:93 +msgid "Special keyboard commands:" +msgstr "Teklatuko komando bereziak:" + +#: engines/scumm/help.cpp:94 +msgid "Show / Hide console" +msgstr "Kontsola erakutsi / ezkutatu" + +#: engines/scumm/help.cpp:95 +msgid "Start the debugger" +msgstr "Araztailea abiarazi" + +#: engines/scumm/help.cpp:96 +msgid "Show memory consumption" +msgstr "Memoria kontsumoa erakutsi" + +#: engines/scumm/help.cpp:97 +msgid "Run in fast mode (*)" +msgstr "Modu azkarrean exekutatu (*)" + +#: engines/scumm/help.cpp:98 +msgid "Run in really fast mode (*)" +msgstr "Era oso azkarrean exekutatu (*)" + +#: engines/scumm/help.cpp:99 +msgid "Toggle mouse capture" +msgstr "Saguaren kaptura" + +#: engines/scumm/help.cpp:100 +msgid "Switch between graphics filters" +msgstr "Filtro grafikoen artean txandakatu" + +#: engines/scumm/help.cpp:101 +msgid "Increase / Decrease scale factor" +msgstr "Eskala faktorea handitu / txikitu" + +#: engines/scumm/help.cpp:102 +msgid "Toggle aspect-ratio correction" +msgstr "Txandakatu fFormatu-ratioaren zuzenketa" + +#: engines/scumm/help.cpp:107 +msgid "* Note that using ctrl-f and" +msgstr "* Ktrl-F eta Ktrl-G" + +#: engines/scumm/help.cpp:108 +msgid " ctrl-g are not recommended" +msgstr "erabiltzea ez da gomendagarria" + +#: engines/scumm/help.cpp:109 +msgid " since they may cause crashes" +msgstr "kraskadurak eta jokoaren jokabide" + +#: engines/scumm/help.cpp:110 +msgid " or incorrect game behavior." +msgstr "desegokia sor dezaketelako." + +#: engines/scumm/help.cpp:114 +msgid "Spinning drafts on the keyboard:" +msgstr "Sorginkeriak teklatuarekin egin:" + +#: engines/scumm/help.cpp:116 +msgid "Main game controls:" +msgstr "Joko kontrol nagusiak:" + +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:161 +msgid "Push" +msgstr "Bultzatu" + +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:162 +msgid "Pull" +msgstr "Tiratu" + +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:207 +msgid "Give" +msgstr "Eman" + +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:190 +#: engines/scumm/help.cpp:208 +msgid "Open" +msgstr "Ireki" + +#: engines/scumm/help.cpp:126 +msgid "Go to" +msgstr "Joan" + +#: engines/scumm/help.cpp:127 +msgid "Get" +msgstr "Jaso" + +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:198 +#: engines/scumm/help.cpp:213 engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:250 +msgid "Use" +msgstr "Erabili" + +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 +msgid "Read" +msgstr "Irakurri" + +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 +msgid "New kid" +msgstr "Pertsonaia aldatu" + +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:171 +msgid "Turn on" +msgstr "Piztu" + +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:172 +msgid "Turn off" +msgstr "Itzali" + +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:194 +msgid "Walk to" +msgstr "Joan" + +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:227 +msgid "Pick up" +msgstr "Jaso" + +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 +msgid "What is" +msgstr "Zer da" + +#: engines/scumm/help.cpp:146 +msgid "Unlock" +msgstr "Ireki" + +#: engines/scumm/help.cpp:149 +msgid "Put on" +msgstr "Ipini" + +#: engines/scumm/help.cpp:150 +msgid "Take off" +msgstr "Kendu" + +#: engines/scumm/help.cpp:156 +msgid "Fix" +msgstr "Konpondu" + +#: engines/scumm/help.cpp:158 +msgid "Switch" +msgstr "Aldatu" + +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:228 +msgid "Look" +msgstr "Begiratu" + +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:223 +msgid "Talk" +msgstr "Hitz egin" + +#: engines/scumm/help.cpp:174 +msgid "Travel" +msgstr "Bidaiatu" + +#: engines/scumm/help.cpp:175 +msgid "To Henry / To Indy" +msgstr "Henry / Indy" + +#. I18N: These are different musical notes +#: engines/scumm/help.cpp:179 +msgid "play C minor on distaff" +msgstr "Jo C minor bastoiarekin" + +#: engines/scumm/help.cpp:180 +msgid "play D on distaff" +msgstr "Jo D bastoiarekin" + +#: engines/scumm/help.cpp:181 +msgid "play E on distaff" +msgstr "Jo E bastoiarekin" + +#: engines/scumm/help.cpp:182 +msgid "play F on distaff" +msgstr "Jo F bastoiarekin" + +#: engines/scumm/help.cpp:183 +msgid "play G on distaff" +msgstr "Jo G bastoiarekin" + +#: engines/scumm/help.cpp:184 +msgid "play A on distaff" +msgstr "Jo A bastoiarekin" + +#: engines/scumm/help.cpp:185 +msgid "play B on distaff" +msgstr "Jo B bastoiarekin" + +#: engines/scumm/help.cpp:186 +msgid "play C major on distaff" +msgstr "Jo C maior bastoiarekin" + +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 +msgid "puSh" +msgstr "Bultzatu" + +#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:215 +msgid "pull (Yank)" +msgstr "Tiratu" + +#: engines/scumm/help.cpp:196 engines/scumm/help.cpp:212 +#: engines/scumm/help.cpp:248 +msgid "Talk to" +msgstr "Hitz egin" + +#: engines/scumm/help.cpp:199 engines/scumm/help.cpp:211 +msgid "Look at" +msgstr "Begiratu" + +#: engines/scumm/help.cpp:200 +msgid "turn oN" +msgstr "Piztu" + +#: engines/scumm/help.cpp:201 +msgid "turn oFf" +msgstr "Itzali" + +#: engines/scumm/help.cpp:217 +msgid "KeyUp" +msgstr "Gora" + +#: engines/scumm/help.cpp:217 +msgid "Highlight prev dialogue" +msgstr "Aurreko elkarrizketa aukeratu" + +#: engines/scumm/help.cpp:218 +msgid "KeyDown" +msgstr "Behera" + +#: engines/scumm/help.cpp:218 +msgid "Highlight next dialogue" +msgstr "Hurrengo elkarrizketa aukeratu" + +#: engines/scumm/help.cpp:222 +msgid "Walk" +msgstr "Ibili" + +#: engines/scumm/help.cpp:225 engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:249 +msgid "Inventory" +msgstr "Inbentarioa" + +#: engines/scumm/help.cpp:226 +msgid "Object" +msgstr "Objektua" + +#: engines/scumm/help.cpp:229 +msgid "Black and White / Color" +msgstr "Zuri Beltza / Koloretan" + +#: engines/scumm/help.cpp:232 +msgid "Eyes" +msgstr "Begiak" + +#: engines/scumm/help.cpp:233 +msgid "Tongue" +msgstr "Mihia" + +#: engines/scumm/help.cpp:235 +msgid "Punch" +msgstr "Ukabilkada" + +#: engines/scumm/help.cpp:236 +msgid "Kick" +msgstr "Ostikada" + +#: engines/scumm/help.cpp:239 engines/scumm/help.cpp:247 +msgid "Examine" +msgstr "Aztertu" + +#: engines/scumm/help.cpp:240 +msgid "Regular cursor" +msgstr "Kurtsore normala" + +#. I18N: Comm is a communication device +#: engines/scumm/help.cpp:243 +msgid "Comm" +msgstr "Comm" + +#: engines/scumm/help.cpp:246 +msgid "Save / Load / Options" +msgstr "Gorde / Kargatu / Aukerak" + +#: engines/scumm/help.cpp:255 +msgid "Other game controls:" +msgstr "Beste kontrol batzuk:" + +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:267 +msgid "Inventory:" +msgstr "Inbentarioa:" + +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:274 +msgid "Scroll list up" +msgstr "Gora" + +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +msgid "Scroll list down" +msgstr "Behera" + +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:268 +msgid "Upper left item" +msgstr "Goiko ezkerreko objektua" + +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:270 +msgid "Lower left item" +msgstr "Beheko ezkerreko objektua" + +#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +msgid "Upper right item" +msgstr "Goiko eskuineko objektua" + +#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:273 +msgid "Lower right item" +msgstr "Beheko eskuineko objektua" + +#: engines/scumm/help.cpp:269 +msgid "Middle left item" +msgstr "Erdiko ezkereko objektua" + +#: engines/scumm/help.cpp:272 +msgid "Middle right item" +msgstr "Erdiko eskuineko objektua" + +#: engines/scumm/help.cpp:279 engines/scumm/help.cpp:284 +msgid "Switching characters:" +msgstr "Pertsonaia aldatu:" + +#: engines/scumm/help.cpp:281 +msgid "Second kid" +msgstr "Bigarren gaztea" + +#: engines/scumm/help.cpp:282 +msgid "Third kid" +msgstr "Hirugarren gaztea" + +#: engines/scumm/help.cpp:294 +msgid "Fighting controls (numpad):" +msgstr "Borroka-kontrolak (tekl. num.)" + +#: engines/scumm/help.cpp:295 engines/scumm/help.cpp:296 +#: engines/scumm/help.cpp:297 +msgid "Step back" +msgstr "Atzera egin" + +#: engines/scumm/help.cpp:298 +msgid "Block high" +msgstr "Blokeo garaia" + +#: engines/scumm/help.cpp:299 +msgid "Block middle" +msgstr "Erdiko blokeoa" + +#: engines/scumm/help.cpp:300 +msgid "Block low" +msgstr "Blokeo baxua" + +#: engines/scumm/help.cpp:301 +msgid "Punch high" +msgstr "Ukabilkada altua" + +#: engines/scumm/help.cpp:302 +msgid "Punch middle" +msgstr "Ukabilkada erdira" + +#: engines/scumm/help.cpp:303 +msgid "Punch low" +msgstr "Ukabilkada baxua" + +#: engines/scumm/help.cpp:306 +msgid "These are for Indy on left." +msgstr "Indy ezkerrean dagoenerako dira," + +#: engines/scumm/help.cpp:307 +msgid "When Indy is on the right," +msgstr "Indy eskuinean dagoenean," + +#: engines/scumm/help.cpp:308 +msgid "7, 4, and 1 are switched with" +msgstr "7, 4 eta 1 aldatuak dira" + +#: engines/scumm/help.cpp:309 +msgid "9, 6, and 3, respectively." +msgstr "9, 6 eta 3rekin, hurrenez hurren." + +#: engines/scumm/help.cpp:316 +msgid "Biplane controls (numpad):" +msgstr "Biplanoaren kontrolak (tekl. num.)" + +#: engines/scumm/help.cpp:317 +msgid "Fly to upper left" +msgstr "Gora eta ezkerrera hegan egin" + +#: engines/scumm/help.cpp:318 +msgid "Fly to left" +msgstr "Ezkerrera hegan egin" + +#: engines/scumm/help.cpp:319 +msgid "Fly to lower left" +msgstr "Behera eta ezkerrera hegan egin" + +#: engines/scumm/help.cpp:320 +msgid "Fly upwards" +msgstr "Gorantz hegan egin" + +#: engines/scumm/help.cpp:321 +msgid "Fly straight" +msgstr "Zuzen hegan egin" + +#: engines/scumm/help.cpp:322 +msgid "Fly down" +msgstr "Behera hegan egin" + +#: engines/scumm/help.cpp:323 +msgid "Fly to upper right" +msgstr "Gora eta eskuinera hegan egin" + +#: engines/scumm/help.cpp:324 +msgid "Fly to right" +msgstr "Eskuinera hegan egin" + +#: engines/scumm/help.cpp:325 +msgid "Fly to lower right" +msgstr "Behera eta eskuinera hegan egin" + +#: engines/scumm/scumm.cpp:1773 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" +"MIDI euskarri natiboak LucasArts-en Roland eguneraketa behar du,\n" +"baina %s ez dago eskuragarri. AdLib erabiliko da." + +#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189 +#, c-format +msgid "" +"Failed to save game state to file:\n" +"\n" +"%s" +msgstr "" +"Errorea fitxategian gordetzean:\n" +"\n" +"%s" + +#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154 +#, c-format +msgid "" +"Failed to load game state from file:\n" +"\n" +"%s" +msgstr "" +"Errorea fitxategitik kargatzean:\n" +"\n" +"%s" + +#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197 +#, c-format +msgid "" +"Successfully saved game state in file:\n" +"\n" +"%s" +msgstr "" +"Partida ondo gorde da hurrengo fitxategian:\n" +"\n" +"%s" + +#: engines/scumm/scumm.cpp:2505 +msgid "" +"Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " +"play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " +"directory inside the Tentacle game directory." +msgstr "" +"Maniac Mansion orain hasi beharko litzateke, baina ScummVM-k ez du " +"baimentzen oraindik. Jolasteko , joan 'Jokoa gehitu' hasierako menura eta " +"aukeratu 'Maniac' direktorioa Tentacle-ren joko-direktorioaren barruan." + +#. I18N: Option for fast scene switching +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +msgid "~Z~ip Mode Activated" +msgstr "~Z~ip modua aktibaturik" + +#: engines/mohawk/dialogs.cpp:93 +msgid "~T~ransitions Enabled" +msgstr "~T~rantsizioak gaituta" + +#. I18N: Drop book page +#: engines/mohawk/dialogs.cpp:95 +msgid "~D~rop Page" +msgstr "Orria ~b~ota" + +#: engines/mohawk/dialogs.cpp:99 +msgid "~S~how Map" +msgstr "~M~apa erakutsi" + +#: engines/mohawk/dialogs.cpp:105 +msgid "~M~ain Menu" +msgstr "Menu ~n~agusia" + +#: engines/mohawk/dialogs.cpp:172 +msgid "~W~ater Effect Enabled" +msgstr "~U~r-efektua gaituta" + +#: engines/sci/engine/kfile.cpp:673 +msgid "Restore game:" +msgstr "Jokoa kargatu:" + +#: engines/sci/engine/kfile.cpp:673 +msgid "Restore" +msgstr "Kargatu" + +#: engines/agos/animation.cpp:550 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "'%s' bideo fitxategia ez da aurkitu!" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:502 +msgid "Failed to load game state from file." +msgstr "Ezin izan da fitxategitik jokoa kargatu." + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 +msgid "Failed to save game state to file." +msgstr "Ezin izan da jokoa fitxategira gorde." + +#: engines/gob/inter_v5.cpp:107 +msgid "Failed to delete file." +msgstr "Ezin izan da fitxategia ezabatu" + +#: engines/groovie/script.cpp:420 +msgid "Failed to save game" +msgstr "Ezin izan da jokoa gorde" + +#: engines/kyra/lol.cpp:478 +msgid "Attack 1" +msgstr "1 erasoa" + +#: engines/kyra/lol.cpp:479 +msgid "Attack 2" +msgstr "2 erasoa" + +#: engines/kyra/lol.cpp:480 +msgid "Attack 3" +msgstr "3 erasoa" + +#: engines/kyra/lol.cpp:481 +msgid "Move Forward" +msgstr "Aurrera mugitu" + +#: engines/kyra/lol.cpp:482 +msgid "Move Back" +msgstr "Atzera mugitu" + +#: engines/kyra/lol.cpp:483 +msgid "Slide Left" +msgstr "Ezkerrera irristatu" + +#: engines/kyra/lol.cpp:484 +msgid "Slide Right" +msgstr "Eskuinera irristatu" + +#: engines/kyra/lol.cpp:485 +msgid "Turn Left" +msgstr "Ezkerrera biratu" + +#: engines/kyra/lol.cpp:486 +msgid "Turn Right" +msgstr "Eskuinera biratu" + +#: engines/kyra/lol.cpp:487 +msgid "Rest" +msgstr "Kargatu" + +#: engines/kyra/lol.cpp:488 +msgid "Options" +msgstr "Aukerak" + +#: engines/kyra/lol.cpp:489 +msgid "Choose Spell" +msgstr "Sorginkeria aukeratu" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" +"General MIDI gailua erabiltzen zaudela dirudi,\n" +"baina zure jokoak Roland MT32 MIDI bakarrik\n" +"erabili dezake. Roland MT32 instrumentuak\n" +"General MIDIkoetara egokitzen saiatuko gara,\n" +"baina posible da pista batzuk egoki ez entzutea." + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" +"Ezin izan da \"sky.cpt\" fitxategia aurkitu!\n" +"Mesedez, jaitsi ezazu www.scummvm.org-etik" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" +"\"sky.cpt\" fitxategiak tamaina desegokia du.\n" +"Mesdez, jaitsi ezazu (berriz) www.scummvm.org-etik" + +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" +"DXA bideoak aurkitu dira, baina ScummVM zlib euskarri gabe konpilatu da" + +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "MPEG2 bideoak ez dira bateragarriak jada" + +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "Ez da '%s' bideoa aurkitu" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" +"ScummVM-k aurkitu du konbertitu beharko liratekeen Broken Sword 1-eko " +"partida gorde zaharrak dituzula.\n" +"Partida gordeen formatu zaharra ez da bateragarria jada, eta beraz ezingo " +"dituzu zure partidak kargatu ez badituzu formatu berrira pasatzen.\n" +"\n" +"Sakatu Ados orain konbertitzeko, bestela berriz galdetuko dizut jokoa berriz " +"martxan jartzen duzunean.\n" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" +"Gordetako partida jadanik existitzen da!\n" +"Gordetako partida zaharra (%s) ala berria (%s) mantendu nahi zenuke?\n" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "Zaharra mantendu" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "Berria mantendu" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "Hau Broken Sword 1 Demoaren amaiera da" + +#: engines/sword2/animation.cpp:435 +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"PSX eszenak aurkitu dira, baina ScummVM RGB kolorearen euskarri gabe " +"konpilatu da" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" +"Ezin da partida gorde %i zirrikituan\n" +"\n" + +#: engines/parallaction/saveload.cpp:211 +msgid "Loading game..." +msgstr "Jokoa kargatzen..." + +#: engines/parallaction/saveload.cpp:226 +msgid "Saving game..." +msgstr "Jokoa gordetzen..." + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" +"ScummVM-k aurkitu du berrizendatu beharko liratekeen Nippon Safes-eko " +"partida gorde zaharrak dituzula.\n" +"Partida gordeen izen zaharra ez da bateragarria jada, eta beraz ezingo " +"dituzu zure partidak kargatu ez badituzu formatu berrira pasatzen.\n" +"\n" +"Sakatu Ados orain konbertitzeko, bestela berriz galdetuko dizut jokoa berriz " +"martxan jartzen duzunean.\n" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "ScummVM-k ondo konbertitu ditu zure gordetako partida guztiak." + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" +"ScummVM-k zenbait abisu inprimatu ditu zure kontsola leihoan eta ezin du " +"ziurtatu zure fitxategi guztiak ondo konbertitu diren.\n" +"\n" +"Mesedez, eman abisua taldeari." + +#: audio/fmopl.cpp:49 +msgid "MAME OPL emulator" +msgstr "MAME OPL emuladorea" + +#: audio/fmopl.cpp:51 +msgid "DOSBox OPL emulator" +msgstr "DOSBox OPL emuladorea" + +#: audio/mididrv.cpp:209 +#, c-format +msgid "" +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected)." +msgstr "" +"Aukeraturiko '%s' soinu gailua ez da aurkitu (baliteke itzalita edo " +"konektatu gabe egotea)" + +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 +msgid "Attempting to fall back to the next available device..." +msgstr "Eskuragarri dagoen hurrengo soinu gailura joaten..." + +#: audio/mididrv.cpp:221 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " +"information." +msgstr "" +"Aukeraturiko '%s' soinu gailua ezin da erabili. Ikusi log fitxategia " +"informazio gehiagorako." + +#: audio/mididrv.cpp:257 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected)." +msgstr "" +"'%s' gogoko soinu gailua ez da aurkitu (baliteke itzalita edo konektatu gabe " +"egotea)" + +#: audio/mididrv.cpp:272 +#, c-format +msgid "" +"The preferred audio device '%s' cannot be used. See log file for more " +"information." +msgstr "" +"'%s' gogoko soinu gailua ezin da erabili. Ikusi log fitxategia informazio " +"gehiagorako." + +#: audio/null.h:43 +msgid "No music" +msgstr "Musikarik ez" + +#: audio/mods/paula.cpp:189 +msgid "Amiga Audio Emulator" +msgstr "Amiga Audio emuladorea" + +#: audio/softsynth/adlib.cpp:1593 +msgid "AdLib Emulator" +msgstr "AdLib emuladorea" + +#: audio/softsynth/appleiigs.cpp:33 +msgid "Apple II GS Emulator (NOT IMPLEMENTED)" +msgstr "Apple II GS emuladorea (INPLEMENTATU GABE)" + +#: audio/softsynth/sid.cpp:1430 +msgid "C64 Audio Emulator" +msgstr "C64 Audio emuladorea" + +#: audio/softsynth/mt32.cpp:293 +msgid "Initializing MT-32 Emulator" +msgstr "MT-32 emuladorea hasieratzen" + +#: audio/softsynth/mt32.cpp:512 +msgid "MT-32 Emulator" +msgstr "MT-32 emuladorea" + +#: audio/softsynth/pcspk.cpp:139 +msgid "PC Speaker Emulator" +msgstr "PC bozgoragailuaren emuladorea" + +#: audio/softsynth/pcspk.cpp:158 +msgid "IBM PCjr Emulator" +msgstr "IBM PCjr emuladorea" + +#: backends/keymapper/remap-dialog.cpp:47 +msgid "Keymap:" +msgstr "Teklen esleipena:" + +#: backends/keymapper/remap-dialog.cpp:66 +msgid " (Effective)" +msgstr "(Egiazkoa)" + +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Active)" +msgstr "(Aktiboa)" + +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "(Blokeaturik)" + +#: backends/keymapper/remap-dialog.cpp:119 +msgid " (Global)" +msgstr "(Orokorra)" + +#: backends/keymapper/remap-dialog.cpp:127 +msgid " (Game)" +msgstr "(Jokoa)" + +#: backends/midi/windows.cpp:164 +msgid "Windows MIDI" +msgstr "Windows MIDI" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:57 +msgid "ScummVM Main Menu" +msgstr "ScummVM menu orokorra" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:63 +msgid "~L~eft handed mode" +msgstr "~E~zkertientzako modua" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:64 +msgid "~I~ndy fight controls" +msgstr "~I~ndy-ren borrokarako kontrolak" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:65 +msgid "Show mouse cursor" +msgstr "Saguaren kurtsorea erakutsi" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:66 +msgid "Snap to edges" +msgstr "Ertzetara itsatsi" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:68 +msgid "Touch X Offset" +msgstr "Ukimenaren X oreka" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:75 +msgid "Touch Y Offset" +msgstr "Ukimenaren Y oreka" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:87 +msgid "Use laptop trackpad-style cursor control" +msgstr "Eramangarrietako trackpad estiloko kurtsore-kontrola erabili" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:88 +msgid "Tap for left click, double tap right click" +msgstr "Toke bat ezker-klikerako, toke bikoitza eskuin klikerako" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:90 +msgid "Sensitivity" +msgstr "Sentikortasuna" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:99 +msgid "Initial top screen scale:" +msgstr "Goiko pantailaren hasierako eskala:" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:105 +msgid "Main screen scaling:" +msgstr "Pantaila nagusiaren eskala:" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:107 +msgid "Hardware scale (fast, but low quality)" +msgstr "Hardware bidezko eskala (arina, baina kalitate baxukoa)" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:108 +msgid "Software scale (good quality, but slower)" +msgstr "Software bidezko eskala (kalitate ona, baina geldoagoa)" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:109 +msgid "Unscaled (you must scroll left and right)" +msgstr "Eskalatu gabe (ezker-eskuin mugitu behar duzu pantaila)" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:111 +msgid "Brightness:" +msgstr "Distira:" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:121 +msgid "High quality audio (slower) (reboot)" +msgstr "Kalitate altuko soinua (geldoagoa) (berrabiarazi)" + +#: backends/platform/ds/arm9/source/dsoptions.cpp:122 +msgid "Disable power off" +msgstr "Itzaltzea desgaitu" + +#: backends/platform/iphone/osys_events.cpp:301 +msgid "Mouse-click-and-drag mode enabled." +msgstr "Saguko klik-eta-arrastratu modua gaituta." + +#: backends/platform/iphone/osys_events.cpp:303 +msgid "Mouse-click-and-drag mode disabled." +msgstr "Saguko klik-eta-arrastratu modua desgaituta." + +#: backends/platform/iphone/osys_events.cpp:314 +msgid "Touchpad mode enabled." +msgstr "Touchpad modua gaituta." + +#: backends/platform/iphone/osys_events.cpp:316 +msgid "Touchpad mode disabled." +msgstr "Touchpad modua desgaituta." + +#: backends/platform/maemo/maemo.cpp:205 +msgid "Click Mode" +msgstr "Klikatzeko modua" + +#: backends/platform/maemo/maemo.cpp:211 +#: backends/platform/symbian/src/SymbianActions.cpp:42 +#: backends/platform/wince/CEActionsPocket.cpp:60 +#: backends/platform/wince/CEActionsSmartphone.cpp:43 +#: backends/platform/bada/form.cpp:281 +msgid "Left Click" +msgstr "Ezker-klika" + +#: backends/platform/maemo/maemo.cpp:214 +msgid "Middle Click" +msgstr "Erdiko klika" + +#: backends/platform/maemo/maemo.cpp:217 +#: backends/platform/symbian/src/SymbianActions.cpp:43 +#: backends/platform/wince/CEActionsSmartphone.cpp:44 +#: backends/platform/bada/form.cpp:273 +msgid "Right Click" +msgstr "Eskuin-klika" + +#: backends/platform/sdl/macosx/appmenu_osx.mm:78 +msgid "Hide ScummVM" +msgstr "ScummVM ezkutatu" + +#: backends/platform/sdl/macosx/appmenu_osx.mm:83 +msgid "Hide Others" +msgstr "Besteak ezkutatu" + +#: backends/platform/sdl/macosx/appmenu_osx.mm:88 +msgid "Show All" +msgstr "Denak erakutsi" + +#: backends/platform/sdl/macosx/appmenu_osx.mm:110 +#: backends/platform/sdl/macosx/appmenu_osx.mm:121 +msgid "Window" +msgstr "Leihoa" + +#: backends/platform/sdl/macosx/appmenu_osx.mm:115 +msgid "Minimize" +msgstr "Minimizatu" + +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:45 +msgid "Normal (no scaling)" +msgstr "Normala (eskalatu gabe)" + +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:64 +msgctxt "lowres" +msgid "Normal (no scaling)" +msgstr "Normala" + +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2147 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 +msgid "Enabled aspect ratio correction" +msgstr "Formatu-ratio zuzenketa gaituta" + +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2153 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 +msgid "Disabled aspect ratio correction" +msgstr "Formatu-ratio zuzenketa desgaituta" + +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2208 +msgid "Active graphics filter:" +msgstr "Filtro grafiko aktiboa:" + +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2250 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 +msgid "Windowed mode" +msgstr "Leiho modua" + +#: backends/graphics/opengl/opengl-graphics.cpp:130 +msgid "OpenGL Normal" +msgstr "OpenGL normala" + +#: backends/graphics/opengl/opengl-graphics.cpp:131 +msgid "OpenGL Conserve" +msgstr "OpenGL aurreztu" + +#: backends/graphics/opengl/opengl-graphics.cpp:132 +msgid "OpenGL Original" +msgstr "OpenGL jatorrizkoa" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:415 +msgid "Current display mode" +msgstr "Oraingo bideo-modua" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:428 +msgid "Current scale" +msgstr "Oraingo eskala" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 +msgid "Active filter mode: Linear" +msgstr "Filtro aktibo modua: lineala" + +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 +msgid "Active filter mode: Nearest" +msgstr "Filtro aktibo modua: hurbilena" + +#: backends/platform/symbian/src/SymbianActions.cpp:38 +#: backends/platform/wince/CEActionsSmartphone.cpp:39 +msgid "Up" +msgstr "Gora" + +#: backends/platform/symbian/src/SymbianActions.cpp:39 +#: backends/platform/wince/CEActionsSmartphone.cpp:40 +msgid "Down" +msgstr "Behera" + +#: backends/platform/symbian/src/SymbianActions.cpp:40 +#: backends/platform/wince/CEActionsSmartphone.cpp:41 +msgid "Left" +msgstr "Ezker" + +#: backends/platform/symbian/src/SymbianActions.cpp:41 +#: backends/platform/wince/CEActionsSmartphone.cpp:42 +msgid "Right" +msgstr "Eskuin" + +#: backends/platform/symbian/src/SymbianActions.cpp:46 +#: backends/platform/wince/CEActionsSmartphone.cpp:47 +msgid "Zone" +msgstr "Zonaldea" + +#: backends/platform/symbian/src/SymbianActions.cpp:47 +#: backends/platform/wince/CEActionsPocket.cpp:54 +#: backends/platform/wince/CEActionsSmartphone.cpp:48 +msgid "Multi Function" +msgstr "Multifuntzioa" + +#: backends/platform/symbian/src/SymbianActions.cpp:48 +msgid "Swap character" +msgstr "Pertsonaia aldatu" + +#: backends/platform/symbian/src/SymbianActions.cpp:49 +msgid "Skip text" +msgstr "Testua saltatu" + +#: backends/platform/symbian/src/SymbianActions.cpp:51 +msgid "Fast mode" +msgstr "Modu bizkorra" + +#: backends/platform/symbian/src/SymbianActions.cpp:53 +msgid "Debugger" +msgstr "Araztailea" + +#: backends/platform/symbian/src/SymbianActions.cpp:54 +msgid "Global menu" +msgstr "Menu orokorra" + +#: backends/platform/symbian/src/SymbianActions.cpp:55 +msgid "Virtual keyboard" +msgstr "Teklatu birtuala" + +#: backends/platform/symbian/src/SymbianActions.cpp:56 +msgid "Key mapper" +msgstr "Teklen esleipena" + +#: backends/events/symbiansdl/symbiansdl-events.cpp:184 +msgid "Do you want to quit ?" +msgstr "Irten nahi al duzu?" + +#: backends/platform/wii/options.cpp:51 +msgid "Video" +msgstr "Bideo" + +#: backends/platform/wii/options.cpp:54 +msgid "Current video mode:" +msgstr "Oraingo bideo modua:" + +#: backends/platform/wii/options.cpp:56 +msgid "Double-strike" +msgstr "Kolpe bikoitza" + +#: backends/platform/wii/options.cpp:60 +msgid "Horizontal underscan:" +msgstr "Underscan horizontala" + +#: backends/platform/wii/options.cpp:66 +msgid "Vertical underscan:" +msgstr "Underscan bertikala:" + +#: backends/platform/wii/options.cpp:71 +msgid "Input" +msgstr "Sarrrera" + +#: backends/platform/wii/options.cpp:74 +msgid "GC Pad sensitivity:" +msgstr "GC Pad-aren sentikortasuna" + +#: backends/platform/wii/options.cpp:80 +msgid "GC Pad acceleration:" +msgstr "GC Pad-aren azelerazioa:" + +#: backends/platform/wii/options.cpp:86 +msgid "DVD" +msgstr "DVD:" + +#: backends/platform/wii/options.cpp:89 backends/platform/wii/options.cpp:101 +msgid "Status:" +msgstr "Egoera:" + +#: backends/platform/wii/options.cpp:90 backends/platform/wii/options.cpp:102 +msgid "Unknown" +msgstr "Ezezaguna" + +#: backends/platform/wii/options.cpp:93 +msgid "Mount DVD" +msgstr "DVD-a muntatu" + +#: backends/platform/wii/options.cpp:94 +msgid "Unmount DVD" +msgstr "DVD-a desmuntatu" + +#: backends/platform/wii/options.cpp:98 +msgid "SMB" +msgstr "SMB" + +#: backends/platform/wii/options.cpp:106 +msgid "Server:" +msgstr "Zerbitzaria:" + +#: backends/platform/wii/options.cpp:110 +msgid "Share:" +msgstr "Konpartituriko direktorioa:" + +#: backends/platform/wii/options.cpp:114 +msgid "Username:" +msgstr "Erabiltzaile-izena:" + +#: backends/platform/wii/options.cpp:118 +msgid "Password:" +msgstr "Pasahitza:" + +#: backends/platform/wii/options.cpp:121 +msgid "Init network" +msgstr "Sarea hasi" + +#: backends/platform/wii/options.cpp:123 +msgid "Mount SMB" +msgstr "SMB-a muntatu" + +#: backends/platform/wii/options.cpp:124 +msgid "Unmount SMB" +msgstr "SMB-a desmuntatu" + +#: backends/platform/wii/options.cpp:143 +msgid "DVD Mounted successfully" +msgstr "DVD-a ondo muntatu da" + +#: backends/platform/wii/options.cpp:146 +msgid "Error while mounting the DVD" +msgstr "Errorea DVD-a muntatzean" + +#: backends/platform/wii/options.cpp:148 +msgid "DVD not mounted" +msgstr "DVD ez muntatua" + +#: backends/platform/wii/options.cpp:161 +msgid "Network up, share mounted" +msgstr "Sarea konektaturik, konpartituriko direktorioa muntaturik" + +#: backends/platform/wii/options.cpp:163 +msgid "Network up" +msgstr "Sarea konektaturik" + +#: backends/platform/wii/options.cpp:166 +msgid ", error while mounting the share" +msgstr ", konpartituriko direktorioa muntatzerakoan errorea" + +#: backends/platform/wii/options.cpp:168 +msgid ", share not mounted" +msgstr ", konpartituriko direktorioa ez muntatua" + +#: backends/platform/wii/options.cpp:174 +msgid "Network down" +msgstr "Sarea konektatu gabe" + +#: backends/platform/wii/options.cpp:178 +msgid "Initializing network" +msgstr "Sarea hasieratzen" + +#: backends/platform/wii/options.cpp:182 +msgid "Timeout while initializing network" +msgstr "Sarearen hasieratze denbora agortu da" + +#: backends/platform/wii/options.cpp:186 +#, c-format +msgid "Network not initialized (%d)" +msgstr "Sarea ez da hasieratu (%d)" + +#: backends/platform/wince/CEActionsPocket.cpp:46 +msgid "Hide Toolbar" +msgstr "Tresna-barra ezkutatu" + +#: backends/platform/wince/CEActionsPocket.cpp:47 +msgid "Show Keyboard" +msgstr "Teklatua erakutsi" + +#: backends/platform/wince/CEActionsPocket.cpp:48 +msgid "Sound on/off" +msgstr "Soinua aktibatuta/desaktibatuta" + +#: backends/platform/wince/CEActionsPocket.cpp:49 +msgid "Right click" +msgstr "Eskuin klik-a" + +#: backends/platform/wince/CEActionsPocket.cpp:50 +msgid "Show/Hide Cursor" +msgstr "Kurtsorea erakutsi/ezkutatu" + +#: backends/platform/wince/CEActionsPocket.cpp:51 +msgid "Free look" +msgstr "Bista librea" + +#: backends/platform/wince/CEActionsPocket.cpp:52 +msgid "Zoom up" +msgstr "Zoom-a hurbildu" + +#: backends/platform/wince/CEActionsPocket.cpp:53 +msgid "Zoom down" +msgstr "Zoom-a urrundu" + +#: backends/platform/wince/CEActionsPocket.cpp:55 +#: backends/platform/wince/CEActionsSmartphone.cpp:49 +msgid "Bind Keys" +msgstr "Teklak esleitu" + +#: backends/platform/wince/CEActionsPocket.cpp:56 +msgid "Cursor Up" +msgstr "Gora" + +#: backends/platform/wince/CEActionsPocket.cpp:57 +msgid "Cursor Down" +msgstr "Behera" + +#: backends/platform/wince/CEActionsPocket.cpp:58 +msgid "Cursor Left" +msgstr "Ezker" + +#: backends/platform/wince/CEActionsPocket.cpp:59 +msgid "Cursor Right" +msgstr "Eskuin" + +#: backends/platform/wince/CEActionsPocket.cpp:267 +#: backends/platform/wince/CEActionsSmartphone.cpp:231 +msgid "Do you want to load or save the game?" +msgstr "Jokoa kargatu edo gorde nahi duzu?" + +#: backends/platform/wince/CEActionsPocket.cpp:326 +#: backends/platform/wince/CEActionsSmartphone.cpp:287 +msgid " Are you sure you want to quit ? " +msgstr " Ziur irten nahi duzula?" + +#: backends/platform/wince/CEActionsSmartphone.cpp:50 +msgid "Keyboard" +msgstr "Teklatua" + +#: backends/platform/wince/CEActionsSmartphone.cpp:51 +msgid "Rotate" +msgstr "Biratu" + +#: backends/platform/wince/CELauncherDialog.cpp:56 +msgid "Using SDL driver " +msgstr "SDL kontrolatzailea erabiltzen" + +#: backends/platform/wince/CELauncherDialog.cpp:60 +msgid "Display " +msgstr "Pantaila" + +#: backends/platform/wince/CELauncherDialog.cpp:83 +msgid "Do you want to perform an automatic scan ?" +msgstr "Bilaketa automatikoa erabili nahi duzu?" + +#: backends/platform/wince/wince-sdl.cpp:515 +msgid "Map right click action" +msgstr "'Eskuin klika' ekintza esleitu" + +#: backends/platform/wince/wince-sdl.cpp:519 +msgid "You must map a key to the 'Right Click' action to play this game" +msgstr "" +"'Eskuin klika' ekintza esleitu behar diozu tekla bati joko honetara jolasteko" + +#: backends/platform/wince/wince-sdl.cpp:528 +msgid "Map hide toolbar action" +msgstr "'Tresna-barra ezkutatu' ekintza esleitu" + +#: backends/platform/wince/wince-sdl.cpp:532 +msgid "You must map a key to the 'Hide toolbar' action to play this game" +msgstr "" +"'Tresna-barra ezkutatu' ekintza tekla bati esleitu behar diozu joko honetara " +"jolasteko" + +#: backends/platform/wince/wince-sdl.cpp:541 +msgid "Map Zoom Up action (optional)" +msgstr "'Zoom-a urrundu' ekintza esleitu (hautazkoa)" + +#: backends/platform/wince/wince-sdl.cpp:544 +msgid "Map Zoom Down action (optional)" +msgstr "'Zoom-a hurbildu' ekintza esleitu (hautazkkoa)" + +#: backends/platform/wince/wince-sdl.cpp:552 +msgid "" +"Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" +msgstr "" +"Ez ahaztu 'tresna-barra ezkutatu' ekintza tekla bati esleitzea inbentario " +"osoa ikusteko" + +#: backends/events/default/default-events.cpp:191 +msgid "Do you really want to return to the Launcher?" +msgstr "Ziur zaude abiarazlera itzuli nahi duzula?" + +#: backends/events/default/default-events.cpp:191 +msgid "Launcher" +msgstr "Abiarazlea" + +#: backends/events/default/default-events.cpp:213 +msgid "Do you really want to quit?" +msgstr "Benetan irten?" + +#: backends/events/gph/gph-events.cpp:338 +#: backends/events/gph/gph-events.cpp:381 +#: backends/events/openpandora/op-events.cpp:139 +msgid "Touchscreen 'Tap Mode' - Left Click" +msgstr "Ukimen-pantailako 'kolpetxo modua' - Ezker klika" + +#: backends/events/gph/gph-events.cpp:340 +#: backends/events/gph/gph-events.cpp:383 +#: backends/events/openpandora/op-events.cpp:141 +msgid "Touchscreen 'Tap Mode' - Right Click" +msgstr "Ukimen-pantailako 'kolpetxo modua' - Eskuin klika" + +#: backends/events/gph/gph-events.cpp:342 +#: backends/events/gph/gph-events.cpp:385 +#: backends/events/openpandora/op-events.cpp:143 +msgid "Touchscreen 'Tap Mode' - Hover (No Click)" +msgstr "Ukimen-pantailako 'kolpetxo modua' - Flotatu (klikik ez)" + +#: backends/events/gph/gph-events.cpp:362 +msgid "Maximum Volume" +msgstr "Bolumen maximoa" + +#: backends/events/gph/gph-events.cpp:364 +msgid "Increasing Volume" +msgstr "Bolumena igotzen" + +#: backends/events/gph/gph-events.cpp:370 +msgid "Minimal Volume" +msgstr "Bolumen minimoa" + +#: backends/events/gph/gph-events.cpp:372 +msgid "Decreasing Volume" +msgstr "Bolumena jaisten" + +#: backends/updates/macosx/macosx-updates.mm:65 +msgid "Check for Updates..." +msgstr "Eguneraketak bilatzen..." + +#: backends/platform/bada/form.cpp:269 +msgid "Right Click Once" +msgstr "Eskuin-klika behin" + +#: backends/platform/bada/form.cpp:277 +msgid "Move Only" +msgstr "Mugitu bakarrik" + +#: backends/platform/bada/form.cpp:291 +msgid "Escape Key" +msgstr "Ihes tekla" + +#: backends/platform/bada/form.cpp:296 +msgid "Game Menu" +msgstr "Jokoaren menua" + +#: backends/platform/bada/form.cpp:301 +msgid "Show Keypad" +msgstr "Teklatu numerikoa erakutsi" + +#: backends/platform/bada/form.cpp:309 +msgid "Control Mouse" +msgstr "Saguaren kontrola" + +#: backends/events/maemosdl/maemosdl-events.cpp:192 +msgid "Clicking Enabled" +msgstr "Klikatzea gaituta" + +#: backends/events/maemosdl/maemosdl-events.cpp:192 +msgid "Clicking Disabled" +msgstr "Klikatzea desgaituta" + +#~ msgid "Hercules Green" +#~ msgstr "Herkules berdea" + +#~ msgid "Hercules Amber" +#~ msgstr "Herkules anbar-kolorekoa" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Herkules berdea" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Herkules anbar-kolorekoa" + +#~ msgid "Save game failed!" +#~ msgstr "Partida gordeak huts egin du!" diff --git a/po/fr_FR.po b/po/fr_FR.po index 2523293efe..d937777ea5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-10-23 14:52+0100\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <scummvm-devel@lists.sf.net>\n" -"Language: Francais\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Francais\n" "Plural-Forms: nplurals=2; plural=n>1;\n" #: gui/about.cpp:91 @@ -44,13 +44,13 @@ msgid "Go up" msgstr "Remonter" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Annuler" @@ -69,15 +69,15 @@ msgstr "Fermer" msgid "Mouse click" msgstr "Clic de souris" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Afficher le clavier" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Changer l'affectation des touches" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 msgid "Toggle FullScreen" msgstr "Basculer en plein щcran" @@ -89,16 +89,17 @@ msgstr "Sщlectionnez une action р affecter" msgid "Map" msgstr "Affecter" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -126,15 +127,15 @@ msgstr "Selectionnez une action" msgid "Press the key to associate" msgstr "Appuyez sur la touche р associer" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Jeu" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -142,29 +143,29 @@ msgstr "" "ID compact du jeu utilisщe pour identifier les sauvegardes et dщmarrer le " "jeu depuis la ligne de commande" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Nom complet du jeu" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nom:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Langue:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -172,281 +173,281 @@ msgstr "" "Langue du jeu. Cela ne traduira pas en anglais par magie votre version " "espagnole du jeu." -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<defaut>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plateforme:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plateforme pour laquelle votre jeu a щtщ conчu" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Systшme:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Graphique" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Utiliser des rщglages graphiques spщcifiques р ce jeux" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Audio" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Utiliser des rщglages audio spщcifiques р ce jeux" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Utiliser des rщglages de volume sonore spщcifiques р ce jeux" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Utiliser des rщglages MIDI spщcifiques р ce jeux" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Utiliser des rщglages MT-32 spщcifiques р ce jeux" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Chemin du Jeu:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Chemin du Jeu:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Extra:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Dщfinie un chemin vers des donnщes suplщmentaires utilisщes par le jeu" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Sauvegardes:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Sauvegardes:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Aucun" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Dщfaut" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Choisir une banque de sons" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Sщlectionner le rщpertoire contenant les donnщes du jeu" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Sщlectionner un rщpertoire supplщmentaire" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Cet ID est dщjр utilisщ par un autre jeu. Choisissez en un autre svp." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~Q~uitter" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Quitter ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "Р ~P~ropos..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Р propos de ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~ptions..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Change les options globales de ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~D~щmarrer" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Dщmarre le jeu sщlectionnщ" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~C~harger" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Charge une sauvegarde pour le jeu sщlectionnщ" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~A~jouter..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "" "Ajoute un jeu р la Liste. Maintenez Shift enfoncщe pour un Ajout Massif" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~E~diter..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Change les options du jeu" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~S~upprimer" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Supprime le jeu de la liste. Les fichiers sont conservщs" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~jouter..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~diter..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~S~upprimer" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Recherche dans la liste de jeux" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Filtre:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Charger le jeu:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Charger" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -454,7 +455,7 @@ msgstr "" "Voulez-vous vraiment lancer la dщtection automatique des jeux? Cela peut " "potentiellement ajouter un grand nombre de jeux." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -462,7 +463,7 @@ msgstr "" msgid "Yes" msgstr "Oui" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -470,37 +471,37 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM n'a pas pu ouvrir le rщpertoire sщlectionnщ." -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM n'a pas trouvщ de jeux dans le rщpertoire sщlectionnщ." -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Choisissez le jeu:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Voulez-vous vraiment supprimer ce jeu?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "" "Le chargement de sauvegarde depuis le lanceur n'est pas supportщ pour ce jeu." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM n'a pas pu trouvщ de moteur pour lancer le jeu sщlectionnщ." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Ajout Massif..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Ajout Massif..." @@ -528,143 +529,143 @@ msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" "%d nouveaux jeux trouvщs, %d jeux ignorщs (dщjр ajoutщ prщcщdemment) ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Jamais" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "Toutes les 5 mins" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "Toutes les 10 mins" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "Toutes les 15 mins" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "Toutes les 30 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Aucune" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Certaines options graphiques n'ont pu ъtre changщes:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "le mode vidщo n'a pu ъtre changщ." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "le mode plein щcran n'a pu ъtre changщ." -#: gui/options.cpp:415 +#: gui/options.cpp:417 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:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Mode graphique:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Mode de rendu:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Mode spщcial de tramage supportщ par certains jeux" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Plein щcran" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Correction du rapport d'aspect" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrige le rapport d'aspect pour les jeu 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Dщtramage EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Active le dщtramage dans les jeux EGA qui le supporte" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 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:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 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:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Sortie Prщfщrщ:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Sortie Audio:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Щmulateur AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Frщquence:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -672,64 +673,64 @@ msgstr "" "Une valeur plus щlevщe donne une meilleure qualitщ audio mais peut ne pas " "ъtre supportщ par votre carte son" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Sortie GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 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:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Ne pas utiliser la musique General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Utiliser le premier pщriphщrique disponible" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "Banque de sons:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Mode mixe AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Utiliser р la fois MIDI et AdLib" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Gain MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Sortie MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -737,195 +738,195 @@ msgstr "" "Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland " "connectщ р l'ordinateur" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 exacte (pas d'щmu GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Activer le mode Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Dщsactiver la conversion des pistes MT-32 en General MIDI" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Ne pas utiliser la musique Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Voix" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Sous-titres" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Les deux" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Dialogue:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Voix" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Affiche les sous-titres et joue les dialogues audio" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vitesse des ST:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Volume Musique:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Musique:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Silence" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Volume Bruitage:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volume des effets spщciaux sonores" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Bruitage:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Volume Dialogues:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Dialogues:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Thшmes:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Thшme:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Interface:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Sauvegarde auto:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Sauvegarde:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Touches" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Langue:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Langue de l'interface graphique de ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Sщlectionner le rщpertoire des thшmes d'interface" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Sщlectionner le rщpertoire pour les fichiers suplщmentaires" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Sщlectionner le rщpertoire des plugins" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1007,22 +1008,22 @@ msgstr "Effacer la valeur" msgid "Engine does not support debug level '%s'" msgstr "Le niveau de debug '%s' n'est pas supportщ par ce moteur de jeu" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menu" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Passer" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Mettre en pause" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Passer la phrase" @@ -1098,25 +1099,6 @@ msgstr "Annuler par l'utilisateur" msgid "Unknown error" msgstr "Erreur inconnue" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Vert" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Ambre" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Vert" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Ambre" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1190,17 +1172,27 @@ msgstr "" "fichier README pour les informations de base et les instructions pour " "obtenir de l'aide supplщmentaire." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Dщsolщ, il n'y a pas d'aide disponible dans ce jeu actuellement. Lisez le " +"fichier README pour les informations de base et les instructions pour " +"obtenir de l'aide supplщmentaire." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~nnuler" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~ouches" @@ -1248,7 +1240,17 @@ msgstr "" "logiciel appropriщ.\n" "Lisez le fichier README pour plus de dщtails." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Dщsolщ, il n'y a pas d'aide disponible dans ce jeu actuellement. Lisez le " +"fichier README pour les informations de base et les instructions pour " +"obtenir de l'aide supplщmentaire." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1258,7 +1260,7 @@ msgstr "" "complшtement supportщ par ScummVM. Il est donc instable et les sauvegardes " "peuvent ne pas marcher avec une future version de ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Jouer quand mъme" @@ -1302,7 +1304,7 @@ msgstr "Jouer" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Quitter" @@ -2002,11 +2004,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Fichier de sщquence '%s' non trouvщ!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Щchec du chargement de l'щtat du jeu depuis le disque." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Щchec de l'enregistrement de l'щtat du jeu sur le disque." @@ -2039,9 +2041,11 @@ msgid "Move Back" msgstr "Reculer" #: engines/kyra/lol.cpp:483 +msgid "Slide Left" msgstr "Faire un pas vers la Gauche" #: engines/kyra/lol.cpp:484 +msgid "Slide Right" msgstr "Faire un pas vers la Droite" #: engines/kyra/lol.cpp:485 @@ -2094,17 +2098,22 @@ msgstr "" "Le fichier \"sky.cpt\" a une taille incorrecte.\n" "Vous pouvez le (re)tщlщcharger sur www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Les sщquences DXA sont prщsente mais ScummVM a щtщ compilщ sans le support " "zlib." -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Les sщquences MPEG2 ne sont plus supportщes" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Sщquence '%s' non trouvщ" @@ -2148,6 +2157,14 @@ msgstr "Garder la nouvelle" msgid "This is the end of the Broken Sword 1 Demo" msgstr "C'est la fin de la dщmo des Chevaliers de Baphomet" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"Les sщquences DXA sont prщsente mais ScummVM a щtщ compilщ sans le support " +"zlib." + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2204,7 +2221,7 @@ msgstr "Щmulateur MAME OPL" msgid "DOSBox OPL emulator" msgstr "Щmulateur DOSBox OPL" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2213,12 +2230,12 @@ msgstr "" "Le pщriphщrique audio sщlectionnщ '%s' n'a pas щtщ trouvщ (il est peut-ъtre " "щteint ou dщbranchщ)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Essaye d'utiliser le prochain pщriphщrique disponible..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2227,7 +2244,7 @@ msgstr "" "The selected audio device '%s' ne peut pas ъtre utilisщ. Voir le fichier de " "log pour plus de dщtails." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2236,7 +2253,7 @@ msgstr "" "Le pщriphщrique audio prщfщrщ '%s' n'a pas щtщ trouvщ (il est peut-ъtre " "щteint ou dщbranchщ)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2294,11 +2311,15 @@ msgstr "(Actif)" msgid " (Active)" msgstr "(Actif)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr "(Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr "(Jeu)" @@ -2378,27 +2399,27 @@ msgstr "Audio haute qualitщ (plus lent) (redщmarrer)" msgid "Disable power off" msgstr "Dщsactivщ l'extinction" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Mode souris-cliquer-et-dщplacer activщ" -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Mode souris-cliquer-et-dщplacer dщsactivщ" -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Mode touchpad activщ" -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Mode touchpad dщsactivщ" -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "Mode Clic" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2406,11 +2427,11 @@ msgstr "Mode Clic" msgid "Left Click" msgstr "Clic Gauche" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 msgid "Middle Click" msgstr "Clic Milieu" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2804,15 +2825,15 @@ msgstr "" "Noubliez pas d'affecter une touche р l'action 'Cacher Bar d'Outils' pour " "pouvoir voir entiшrement l'inventaire" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Voulez-vous vraiment retourner au Lanceur?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Lanceur" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Voulez-vous vraiment quitter?" @@ -2886,6 +2907,20 @@ msgstr "Clic Activщ" msgid "Clicking Disabled" msgstr "Clic Dщsactivщ" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Vert" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Ambre" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Vert" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Ambre" + #~ msgid "Save game failed!" #~ msgstr "Щchec de la sauvegarde!" diff --git a/po/hu_HU.po b/po/hu_HU.po index b4802eacba..f230c84d1a 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2012-02-17 07:10+0100\n" "Last-Translator: Gruby <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "Feljebb" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Mщgse" @@ -72,15 +72,15 @@ msgstr "Bezсr" msgid "Mouse click" msgstr "Egщrkattintсs" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Billentyћzet beсllэtсsok" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Billentyћk сtсllэtсsa" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 msgid "Toggle FullScreen" msgstr "Teljeskщpernyѕ kapcsolѓ" @@ -92,16 +92,17 @@ msgstr "Vсlassz mћveletet a kiosztсshoz" msgid "Map" msgstr "Kiosztсs" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -129,324 +130,324 @@ msgstr "Vсlassz egy mћveletet" msgid "Press the key to associate" msgstr "Nyomj egy billentyћt a tсrsэtсshoz" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Jсtщk" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" msgstr "" "Rіvid jсtщkazonosэtѓ a jсtщkmentщsekhez щs a jсtщk parancssori futtatсsсhoz" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nщv:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "A jсtщk teljes neve" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nщv:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Nyelv:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "" "A jсtщk nyelve. Ne сllэtsd сt a pl. Spanyol nyelvћ jсtщkodat Angol nyelvre" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<alapщrtelmezett>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Platform amire a jсtщkot eredetileg kщszэtettщk" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Audiѓ" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Globсlis MT-32 beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 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:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Mappa kivсlasztсs a jсtщkok kiegщszэtѕ fсjljaihoz" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Mentщs Mappa:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Mentщs Mappa:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Nincs" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Alapщrtelmezett" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "SoundFont kivсlasztсs" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Jсtщkok helyщnek kivсlasztсsa" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Vсlassz mappсt a jсtщk kiegщszэtѕkhіz" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Vсlaszz jсtщkmentщseknek mappсt" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Ez a jсtщkazonosэtѓ ID mсr foglalt, Vсlassz egy mсsikat." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "Kilщpщs" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "ScummVM bezсrсsa" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "Nщvjegy" -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "ScummVM nщvjegy" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~pciѓk..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Globсlis ScummVM opciѓk cserщje" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "Indэtсs" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "A vсlasztott jсtщk indэtсsa" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "Betіltщs" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Kimentett jсtщkсllсs betіltщse" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "Jсtщk hozzсadсs" -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Tratsd lenyomva a Shift-et a Masszэv mѓdhoz" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "Jсtщkopciѓk" -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Jсtщk beсllэtсsok megvсltoztatсsa" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "Jсtщk tіrlщse" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Tіrli a jсtщk nevщt a listсrѓl. A jсtщkfсjlok megmaradnak" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "Jсtщk hozzсadсs" -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Jсtщkopciѓk" -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "Jсtщk tіrlщse" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Keresщs a jсtщklistсban" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Keresщs:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Jсtщk betіltщse:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Betіltщs" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -454,7 +455,7 @@ msgstr "" "Biztos hogy futtatod a Masszэv jсtщkdetektort? Ez potenciсlisan sok jсtщkot " "hozzсad a listсhoz." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -462,7 +463,7 @@ msgstr "" msgid "Yes" msgstr "Igen" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -470,37 +471,37 @@ msgstr "Igen" msgid "No" msgstr "Nem" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nem tudja megnyitni a vсlasztott mappсt!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "A ScummVM nem talсlt egy jсtщkot sem a vсlasztott mappсban!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Vсlassztott jсtщk:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Biztosan tіrіlni akarod ezt a jсtщkkonfigurсciѓt?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Ez a jсtщk nem tсmogatja a jсtщkсllсs betіltщst az indэtѓbѓl." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM nem talсlt olyan jсtщkmotort ami a vсlasztott jсtщkot tсmogatja!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Masszэv mѓd..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Masszэv mѓd..." @@ -527,202 +528,202 @@ msgstr "%d Mappa сtvizsgсlva..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "%d њj jсtщkot talсltam, %d elѕzѕleg hozzсadott jсtщk kihagyva..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Soha" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "5 percenkщnt" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "10 percenkщnt" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "15 percenkщnt" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "30 percenkщnt" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Nincs" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "a videѓmѓd nem vсltozott." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott" -#: gui/options.cpp:415 +#: gui/options.cpp:417 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:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Grafikus mѓd:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Kirajzolсs mѓd:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 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:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Teljeskщpernyѕs mѓd:" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Kщpmщretarсny korrekciѓ" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA szinjavэtсs" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "EGA szэnjavэtсs tсmogatott EGA jсtщkokban" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Elsѕdleges eszkіz:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 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:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Elsѕdleges eszk.:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Kimeneti rсta:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 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:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "GM Eszkіz:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Ne hasznсlj General MIDI zenщt" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Vegyes AdLib/MIDI mѓd" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "MIDI erѕsэtщs:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "MT-32 Eszkіz:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -730,190 +731,190 @@ msgstr "" "Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a " "gщpedhez щs hasznсlni akarod" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Roland GS Mѓd engedщlyezve" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "General MIDI lekщpezщs Roland MT-32 zenщs jсtщkokhoz kikapcsolva" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Ne hasznсlj Roland MT-32 zenщt" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Szіveg щs beszщd:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Csak beszщd" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Csak felirat" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Mind" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Felirat щs beszщd:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Besz" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Text" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Mind" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Hang щs feliratok megjelenэtщse" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "жsszes nщmэtсsa" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Speciсlis hangeffektusok hangereje" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tщma:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI Renderelѕ:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Billentyћk" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "GUI nyelve:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "A ScummVM GUI nyelve" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Vсlassz jсtщkmentщs mappсt" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "GUI tщma mappa kivсlasztсsa" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Mappa vсlasztсs az extra fсjloknak" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Plugin mappa kivсlasztсsa" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -995,22 +996,22 @@ msgstr "Щrtщk tіrlщse" msgid "Engine does not support debug level '%s'" msgstr "A motor nem tсmogatja a '%s' debug szintet" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menќ" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Tovсbb" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Szќnet" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Sor сtlщpщse" @@ -1086,25 +1087,6 @@ msgstr "Felhasznсlѓi megszakэtсs" msgid "Unknown error" msgstr "Ismeretlen hiba" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Zіld" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Sсrga" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Zіld" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Sсrga" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1175,17 +1157,26 @@ msgstr "" "Sajnсlom, a motor jelenleg nem tartalmaz jсtщk kіzbeni sњgѓt. Olvassd el a " "README-t az alap informсciѓkrѓl, щs hogy hogyan segэthetsz a kщsѕbbiekben." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Sajnсlom, a motor jelenleg nem tartalmaz jсtщk kіzbeni sњgѓt. Olvassd el a " +"README-t az alap informсciѓkrѓl, щs hogy hogyan segэthetsz a kщsѕbbiekben." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "Mщgse" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "Billentyќk" @@ -1233,7 +1224,16 @@ msgstr "" "hogy a jсtщk zenщje hallhatѓ legyen.\n" "Nщzd meg a README fсjlt a rщszletekщrt." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Sajnсlom, a motor jelenleg nem tartalmaz jсtщk kіzbeni sњgѓt. Olvassd el a " +"README-t az alap informсciѓkrѓl, щs hogy hogyan segэthetsz a kщsѕbbiekben." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1243,7 +1243,7 @@ msgstr "" "ScummVM. Szсmэts rс hogy nem stabilan fut, щs a mentщsek nem mћkіdnek a " "jіvѕbeni ScummVM verziѓkkal." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Indэtсs эgy is" @@ -1287,7 +1287,7 @@ msgstr "Jсtщk" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Kilщpщs" @@ -1986,11 +1986,11 @@ msgid "Cutscene file '%s' not found!" msgstr "'%s' сtvezetѕ fсjl nem talсlhatѓ" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Jсtщkсllсs betіltщse fсjlbѓl nem sikerќlt." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Jсtщkсllсs mentщse fсjlba nem sikerќlt." @@ -2080,15 +2080,20 @@ msgstr "" "A \"sky.cpt\" fсjl mщrete nem megfelelѕ.\n" "Tіltsd le a www.scummvm.org oldalсrѓl" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "DXA сtvezetѕ elщrhetѕ, de a ScummVM zlib tсmogatсs nincs lefordэtva" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "MPEG2 сtvezetѕk mсr nem tсmogatottak" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "'%s' сtvezetѕ nem talсlhatѓ" @@ -2132,6 +2137,12 @@ msgstr "Az њjat megtartom" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Ez a Broken Sword 1 Demo vщge" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "DXA сtvezetѕ elщrhetѕ, de a ScummVM zlib tсmogatсs nincs lefordэtva" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2189,7 +2200,7 @@ msgstr "MAME OPL emulсtor" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulсtor" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2197,12 +2208,12 @@ msgid "" msgstr "" "A kivсlasztott '%s' hangeszkіz nem talсlhatѓ (Lekapcsoltad, vagy kihњztad)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "A kіvetkezѕ elщrhetѕ eszkіz keresщse..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2211,7 +2222,7 @@ msgstr "" "A kivсlasztott '%s' hangeszkіz nem hasznсlhatѓ. Bѕvebb informсciѓ a " "naplѓfсjlban." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2219,7 +2230,7 @@ msgid "" msgstr "" "Az elsѕdleges '%s' hangeszkіz nem talсlhatѓ (Lekapcsoltad, vagy kihњztad)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2276,11 +2287,15 @@ msgstr " (Tщnyleges)" msgid " (Active)" msgstr " (Aktэv)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Globсlis)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Jсtщk)" @@ -2360,27 +2375,27 @@ msgstr "Jѓminѕsщgќ audiѓ (lassabb)(њjraindэtсs)" msgid "Disable power off" msgstr "Leсllэtсs tiltva" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Egщr kattint-щs-hњz mѓd engedщlyezve." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Egщr kattint-щs-hњz mѓd letiltva." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Touchpad mѓd engedщlyezve." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Touchpad mѓd letiltva." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "Kattintсs Mѓd" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2388,11 +2403,11 @@ msgstr "Kattintсs Mѓd" msgid "Left Click" msgstr "Bal katt" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 msgid "Middle Click" msgstr "Kіzщpsѕ katt" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2782,15 +2797,15 @@ msgstr "" "Ne felejts billentyћt tсrsэtani az 'Eszkіztсr rejtщs' mћvelethez, hogy lсsd " "a teljes listсt" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Biztos hogy visszatщrsz az indэtѓpulthoz?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Indэtѓpult" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Biztos hogy ki akarsz lщpni ?" @@ -2864,6 +2879,20 @@ msgstr "Kattintсs engedve" msgid "Clicking Disabled" msgstr "Kattintсs tiltva" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Zіld" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Sсrga" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Zіld" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Sсrga" + #~ msgid "Save game failed!" #~ msgstr "Jсtщk mentщse nem sikerќlt!" diff --git a/po/it_IT.po b/po/it_IT.po index 43ae6cb60d..29811d81ff 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-10-08 17:29+0100\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" -"Language: Italiano\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Italiano\n" #: gui/about.cpp:91 #, c-format @@ -43,13 +43,13 @@ msgid "Go up" msgstr "Su" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Annulla" @@ -68,15 +68,15 @@ msgstr "Chiudi" msgid "Mouse click" msgstr "Clic del mouse" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Mostra tastiera" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Riprogramma tasti" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Attiva / disattiva schermo intero" @@ -89,16 +89,17 @@ msgstr "Scegli un'azione da mappare" msgid "Map" msgstr "Mappa" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -126,15 +127,15 @@ msgstr "Seleziona un'azione" msgid "Press the key to associate" msgstr "Premi il tasto da associare" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Gioco" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -142,309 +143,309 @@ msgstr "" "Breve identificatore di gioco utilizzato per il riferimento a salvataggi e " "per l'esecuzione del gioco dalla riga di comando" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Titolo completo del gioco" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Lingua:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "" "Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<predefinito>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Piattaforma:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "La piattaforma per la quale il gioco ш stato concepito" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Piattaf.:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafica" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "Grafica" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Audio" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Percorsi" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Perc." -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Percorso gioco:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Perc. gioco:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Percorso extra:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Specifica il percorso di ulteriori dati usati dal gioco" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Perc. extra:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Salvataggi:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Specifica dove archiviare i salvataggi" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Salvataggi:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Nessuno" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinito" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Seleziona SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Seleziona la cartella contenente i file di gioco" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Seleziona la cartella di gioco aggiuntiva" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Seleziona la cartella dei salvataggi" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Questo ID di gioco ш giр in uso. Si prega di sceglierne un'altro." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "C~h~iudi" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Esci da ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "~I~nfo..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Informazioni su ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~pzioni..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Modifica le opzioni globali di ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~G~ioca" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Esegue il gioco selezionato" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~C~arica..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Carica un salvataggio del gioco selezionato" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~A~ggiungi gioco..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Tieni premuto Shift per l'aggiunta in massa" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~M~odifica gioco..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Modifica le opzioni di gioco" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~R~imuovi gioco" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Rimuove il gioco dalla lista. I file del gioco rimarranno intatti" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~gg. gioco..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~M~odif. gioco..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~R~im. gioco" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Cerca nella lista dei giochi" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Cerca:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Carica gioco:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Carica" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -452,7 +453,7 @@ msgstr "" "Vuoi davvero eseguire il rilevatore di giochi in massa? Potrebbe aggiungere " "un numero enorme di giochi." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -460,7 +461,7 @@ msgstr "" msgid "Yes" msgstr "Sь" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -468,40 +469,40 @@ msgstr "Sь" msgid "No" msgstr "No" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM non ha potuto aprire la cartella specificata!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM non ha potuto trovare nessun gioco nella cartella specificata!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Scegli il gioco:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Sei sicuro di voler rimuovere questa configurazione di gioco?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "" "Questo gioco non supporta il caricamento di salvataggi dalla schermata di " "avvio." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM non ha potuto trovare un motore in grado di eseguire il gioco " "selezionato!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Agg. massa..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Agg. in massa..." @@ -528,143 +529,143 @@ msgstr "%d cartelle analizzate..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Rilevati %d nuovi giochi, ignorati %d giochi aggiunti in precedenza..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Mai" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "ogni 5 minuti" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "ogni 10 minuti" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "ogni 15 minuti" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "ogni 30 minuti" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Nessuno" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Impossibile applicare alcuni dei cambiamenti nelle opzioni grafiche." -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "impossibile modificare la modalitр video." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "impossibile modificare l'impostazione schermo intero" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "impossibile modificare l'impostazione proporzioni" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Modalitр:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Resa grafica:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Modalitр a schermo intero" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Correzione proporzioni" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregge le proporzioni dei giochi 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Undithering EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Attiva undithering nei giochi EGA che lo supportano" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Disp. preferito:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Dispositivo audio:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Specifica il dispositivo audio o l'emulatore della scheda audio preferiti" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 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:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferito:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Disposit. audio:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Emulatore AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib ш utilizzato per la musica in molti giochi" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Frequenza:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -672,62 +673,62 @@ msgstr "" "Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non " "essere supportati dalla tua scheda audio" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Non utilizzare la musica General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Utilizza il primo dispositivo disponibile" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont ш supportato da alcune schede audio, Fluidsynth e Timidity" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Modalitр mista AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilizza generazione di suono sia MIDI che AdLib" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Guadagno MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -735,192 +736,192 @@ msgstr "" "Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland " "che ш connesso al tuo computer" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 effettivo (disat.emul.GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Attiva la modalitр Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Disattiva la mappatura General MIDI per i giochi con colonna sonora Roland " "MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Non utilizzare la musica Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Voci" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Sottotitoli" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Entrambi" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Voci" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Sub" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Entr." -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Mostra i sottotitoli e attiva le voci" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Disattiva audio" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volume degli effetti sonori" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Percorso tema:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Perc. tema:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Percorso plugin:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Perc. plugin:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Renderer GUI:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Tasti" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Lingua GUI:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Lingua dell'interfaccia grafica di ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Devi riavviare ScummVM affinchщ le modifiche abbiano effetto." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Seleziona la cartella per i salvataggi" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Seleziona la cartella dei temi dell'interfaccia" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Seleziona la cartella dei file aggiuntivi" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Seleziona la cartella dei plugin" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1002,22 +1003,22 @@ msgstr "Cancella" msgid "Engine does not support debug level '%s'" msgstr "Il motore non supporta il livello di debug '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menu" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Salta" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Salta battuta" @@ -1094,25 +1095,6 @@ msgstr "Utente cancellato" msgid "Unknown error" msgstr "Errore sconosciuto" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules verde" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules ambra" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules verde" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules ambra" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1184,17 +1166,27 @@ msgstr "" "gioco. Si prega di consultare il file README per le informazioni di base e " "per le istruzioni su come ottenere ulteriore assistenza." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Siamo spiacenti, ma l'attuale motore non prevede aiuto all'interno del " +"gioco. Si prega di consultare il file README per le informazioni di base e " +"per le istruzioni su come ottenere ulteriore assistenza." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~nnulla" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~asti" @@ -1242,7 +1234,17 @@ msgstr "" "la musica del gioco.\n" "Vedi il file README per i dettagli." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Siamo spiacenti, ma l'attuale motore non prevede aiuto all'interno del " +"gioco. Si prega di consultare il file README per le informazioni di base e " +"per le istruzioni su come ottenere ulteriore assistenza." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1252,7 +1254,7 @@ msgstr "" "ScummVM. Ш quindi possibile che sia instabile, e i salvataggi potrebbero non " "funzionare con future versioni di ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Avvia comunque" @@ -1296,7 +1298,7 @@ msgstr "Gioca" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Esci" @@ -1997,11 +1999,11 @@ msgid "Cutscene file '%s' not found!" msgstr "File della scena di intermezzo '%s' non trovato!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Impossibile caricare il gioco dal file." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Impossibile salvare il gioco nel file." @@ -2097,17 +2099,22 @@ msgstr "" "Il file \"sky.cpt\" non ha una dimensione corretta.\n" "Si prega di (ri)scaricarlo da www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Sono state trovare scene di intermezzo DXA ma ScummVM ш stato compilato " "senza il supporto zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Le scene di intermezzo MPEG2 non sono piљ supportate" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Scena di intermezzo '%s' non trovata" @@ -2151,6 +2158,14 @@ msgstr "Mantieni quello nuovo" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Questa ш la fine della demo di Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"Sono state trovare scene di intermezzo DXA ma ScummVM ш stato compilato " +"senza il supporto zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2209,7 +2224,7 @@ msgstr "Emulatore OPL MAME" msgid "DOSBox OPL emulator" msgstr "Emulatore OPL DOSBox" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2218,12 +2233,12 @@ msgstr "" "Il dispositivo audio selezionato '%s' non ш stato trovato (potrebbe essere " "spento o scollegato)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Tentativo di ripristinare il primo dispositivo disponibile..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2232,7 +2247,7 @@ msgstr "" "Il dispositivo audio selezionato '%s' non puђ essere usato. Vedi il file log " "per maggiori informazioni." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2241,7 +2256,7 @@ msgstr "" "Il dispositivo audio preferito '%s' non ш stato trovato (potrebbe essere " "spento o scollegato)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2299,11 +2314,15 @@ msgstr " (Attivo)" msgid " (Active)" msgstr " (Attivo)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Globale)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Gioco)" @@ -2383,27 +2402,27 @@ msgstr "Audio ad alta qualitр (piљ lento) (riavviare)" msgid "Disable power off" msgstr "Disattiva spegnimento in chiusura" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Modalitр mouse-clicca-e-trascina attivata." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Modalitр mouse-clicca-e-trascina disattivata." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Modalitр touchpad attivata." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Modalitр touchpad disattivata." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2411,12 +2430,12 @@ msgstr "" msgid "Left Click" msgstr "Clic sinistro" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Oggetto al centro a sinistra" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2808,15 +2827,15 @@ msgstr "" "Non dimenticare di mappare un tasto per l'azione \"Nascondi barra degli " "strumenti\" per vedere l'intero inventario" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Sei sicuro di voler tornare all'elenco giochi?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Elenco giochi" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Sei sicuro di voler uscire?" @@ -2894,6 +2913,20 @@ msgstr "" msgid "Clicking Disabled" msgstr "" +#~ msgid "Hercules Green" +#~ msgstr "Hercules verde" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules ambra" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules verde" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules ambra" + #~ msgid "Save game failed!" #~ msgstr "Salvataggio fallito!" diff --git a/po/nb_NO.po b/po/nb_NO.po index a4cf94e210..780cd8daa7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-04-25 22:56+0100\n" "Last-Translator: Einar Johan T. Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" -"Language: Norsk (bokmaal)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Norsk (bokmaal)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Poedit-Language: Norsk Bokmхl\n" "X-Poedit-Country: NORWAY\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "Gх tilbake" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" @@ -72,15 +72,15 @@ msgstr "Lukk" msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Omkoble taster" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Veksle fullskjerm" @@ -93,16 +93,17 @@ msgstr "Velg en handling for kobling" msgid "Map" msgstr "Koble" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -130,15 +131,15 @@ msgstr "Vennligst velg en handling" msgid "Press the key to associate" msgstr "Trykk tasten som skal kobles" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Spill" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -146,29 +147,29 @@ msgstr "" "Kort spill-identifikator, brukt for х referere til lagrede spill, og х kjјre " "spillet fra kommandolinjen" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Full spilltittel" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Sprхk:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -176,280 +177,280 @@ msgstr "" "Spillets sprхk. Dette vil ikke gjјre din spanske spillversjon om til engelsk " "versjon" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plattform spillet opprinnelig ble designet for" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Lyd" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Velg SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Velg mappe med spilldata" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Velg mappe med ytterligere data" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Velg mappe for lagrede spill" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Denne spill-IDen er allerede i bruk. Vennligst velg en annen." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vslutt" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Avslutt ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~V~alg..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Endre globale ScummVM-innstillinger" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Start valgt spill" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~Х~pne..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Хpne lagret spill for det valgte spillet" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~L~egg til spill..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Hold Shift for х legge til flere" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~R~ediger spill..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Endre spillinstillinger" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~F~jern spill" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Fjern spill fra listen. Spilldataene forblir intakte" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~L~egg til spill..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~R~ediger spill..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~F~jern spill" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Sјk i spilliste" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Sјk:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Хpne spill:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Хpne" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -457,7 +458,7 @@ msgstr "" "Vil du virkelig kjјre flerspill-finneren? Dette kan potensielt legge til et " "stort antall spill." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -465,7 +466,7 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -473,37 +474,37 @@ msgstr "Ja" msgid "No" msgstr "Nei" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunne ikke хpne den valgte mappen!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM kunne ikke finne noe spill i den valgte mappen!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Velg spill:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Vil du virkelig fjerne denne spillkonfigurasjonen?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Dette spillet stјtter ikke lasting av spill fra oppstarteren." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM kunne ikke finne noen motor som kunne kjјre det valgte spillet!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Legg til flere..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Legg til flere..." @@ -530,141 +531,141 @@ msgstr "Sjekket %d mapper ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Fant %d nye spill ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "hvert 5. min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "hvert 10. min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "hvert 15. min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "hvert 30. min" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stјttet av enkelte spill" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Aspekt-rate korrigering" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Korriger aspekt-rate for 320x200-spill" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA av-dithering" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Slхr av dithering i EGA-spill som stјtter det." -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Foretrukket enhet:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretrukket enh.:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -672,60 +673,60 @@ msgstr "" "Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt " "lydkort " -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Velger standard lydenhet for General MIDI-utdata" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Bruk fјrste tilgjengelige enhet" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Mikset AdLib/MIDI-modus" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Bruk bхde MIDI- og AdLib- lydgenerering" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "MT-32 Enhet:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -733,191 +734,191 @@ msgstr "" "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " "vil bruke dette." -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Aktiver Roland GS-modus" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Slх av General MIDI-kobling for spill som har Roland MT-32-lydspor" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Ikke bruk Roland MT-32-musikk" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Begge" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Teksthastighet:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Vis undertekster, og spill av tale" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Underteksthastighet:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Div" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI-tegner:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 #, fuzzy msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mх omstarte ScummVM for at endringene skal skje. " -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Velg mappe for lagrede spill" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Velg mappe for GUI-temaer" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Velg mappe for ytterligere filer" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Velg mappe for plugins" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -999,22 +1000,22 @@ msgstr "Tјm verdi" msgid "Engine does not support debug level '%s'" msgstr "Motoren stјtter ikke debug-nivх '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Meny" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Hopp over" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Hopp over linje" @@ -1090,25 +1091,6 @@ msgstr "" msgid "Unknown error" msgstr "Ukjent feil" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Grјnn" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Oransje" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Grјnn" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Oransje" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1177,17 +1159,24 @@ msgid "" "further assistance." msgstr "" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~vbryt" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~aster" @@ -1227,14 +1216,21 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "" @@ -1280,7 +1276,7 @@ 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Avslutt" @@ -1985,7 +1981,7 @@ msgid "Cutscene file '%s' not found!" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 #, fuzzy msgid "Failed to load game state from file." msgstr "" @@ -1993,7 +1989,7 @@ msgstr "" "\n" "%s" -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 #, fuzzy msgid "Failed to save game state to file." msgstr "" @@ -2092,15 +2088,20 @@ msgid "" "Please (re)download it from www.scummvm.org" msgstr "" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "" @@ -2135,6 +2136,11 @@ msgstr "" msgid "This is the end of the Broken Sword 1 Demo" msgstr "" +#: engines/sword2/animation.cpp:435 +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2182,33 +2188,33 @@ msgstr "MAME OPL emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2265,11 +2271,15 @@ msgstr " (Aktiv)" msgid " (Active)" msgstr " (Aktiv)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Spill)" @@ -2349,29 +2359,29 @@ msgstr "Hјy lydkvalitet (tregere) (omstart)" msgid "Disable power off" msgstr "Deaktiver strјmsparing" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 #, fuzzy msgid "Mouse-click-and-drag mode enabled." msgstr "Touchpad-modus aktivert." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 #, fuzzy msgid "Mouse-click-and-drag mode disabled." msgstr "Touchpad-modus deaktivert." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Touchpad-modus aktivert." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Touchpad-modus deaktivert." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2379,12 +2389,12 @@ msgstr "" msgid "Left Click" msgstr "Venstreklikk" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Midtre venstre gjenstand" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2786,17 +2796,17 @@ msgstr "" "Ikke glem х koble en tast til handlingen 'Skjul verktјylinje' for х se hele " "inventaret" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 #, fuzzy msgid "Do you really want to return to the Launcher?" msgstr "Vil du virkelig slette dette lagrede spillet?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 #, fuzzy msgid "Launcher" msgstr "Slх" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 #, fuzzy msgid "Do you really want to quit?" msgstr "Vil du avslutte?" @@ -2877,6 +2887,20 @@ msgstr "" msgid "Clicking Disabled" msgstr "" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Grјnn" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Oransje" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Grјnn" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Oransje" + #, fuzzy #~ msgid "Save game failed!" #~ msgstr "Lagret spill:" diff --git a/po/nn_NO.po b/po/nn_NO.po index 7865d6c504..00dce83302 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-04-25 23:07+0100\n" "Last-Translator: Einar Johan T. Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" -"Language: Norsk (nynorsk)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Norsk (nynorsk)\n" "X-Poedit-Language: Norwegian Nynorsk\n" "X-Poedit-SourceCharset: iso-8859-1\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "Gх tilbake" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" @@ -72,15 +72,15 @@ msgstr "Steng" msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Syn Tastatur" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Omkople tastar" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Veksle fullskjerm" @@ -93,16 +93,17 @@ msgstr "Vel ei handling for kopling:" msgid "Map" msgstr "Kople" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -130,15 +131,15 @@ msgstr "Vel ei handling" msgid "Press the key to associate" msgstr "Trykk tasten du vil kople" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Spel" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -146,29 +147,29 @@ msgstr "" "Kort spelidentifikator nytta for х referere til lagra spel, og х kјyre " "spelet frх kommandolinja" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Full speltittel:" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Sprхk:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -176,286 +177,286 @@ msgstr "" "Spelets sprхk. Dette vil ikkje gjere den spanske versjonen av spelet til ein " "engelsk versjon" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plattform spelet opprineleg vart designa for" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Lyd" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Vel SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Vel mappe med speldata" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Vel mappe for lagra spel" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "" -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vslutt" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Avslutt ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~V~al..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Endre globale ScummVM-instillingar" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Start det velde spelet" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~Х~pne..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Хpne eit lagra spel for the velde spelet" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~L~egg til spel..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Hold Shift nede for х legge til fleire" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~R~ediger spel..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Endre spelinstillingar" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~F~jern spel" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~L~egg til spel..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~R~ediger spel..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~F~jern spel" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Sјk i spelliste" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Sјk:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Хpne spel:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Хpne" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." msgstr "" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -463,7 +464,7 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -471,38 +472,38 @@ msgstr "Ja" msgid "No" msgstr "Nei" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunne ikkje хpne den velde mappa!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM kunne ikkje finne noko spel i den velde mappa!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Vel spelet:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Vil du verkeleg fjerne denne spelkonfigurasjonen?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Dette spelet stјttar ikkje хpning av lagra spel frх oppstartaren." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM kunne ikkje finne nokon motor som var i stand til х kјyre det velde " "spelet!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Legg til fleire..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Legg til fleire..." @@ -529,141 +530,141 @@ msgstr "Sјkt i %d mappar ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Oppdaga %d nye spel ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "kvart 5. min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "kvart 10. min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "kvart 15. min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "kvart 30. min" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Teiknemodus:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som stјttast av nokre spel" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Aspekt-korrigering" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Rett opp aspekt for 320x200 spel" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib nyttast til musikk i mange spel" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -671,250 +672,250 @@ msgstr "" "Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av " "lydkortet ditt" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Ikkje nytt General MIDI musikk" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont stјttast av enkelte lydkort, Fluidsynth og Timidity" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Blanda AdLib/MIDI-modus" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Nytt bхe MIDI og AdLib lydskaping" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (ingen GS-emulering)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Aktiver Roland GS-modus" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "Slхr av General MIDI-kopling for spel med Roland MT-32 lydspor" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Ikkje nytt Roland MT-32 musikk" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Teksting" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Begge" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Bхe" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Vis teksting og spel av tale" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Div" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI-teiknar:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Tastar" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 #, fuzzy msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mх omstarte ScummVM for at endringane skal skje." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Vel mappe for lagra spel" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Vel ei mappe for GUI-tema:" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Vel ei mappe for plugins" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -996,22 +997,22 @@ msgstr "Tјm verdi" msgid "Engine does not support debug level '%s'" msgstr "Motoren stјttar ikkje debug-nivх '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Meny" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Hopp over" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Hopp over linje" @@ -1088,25 +1089,6 @@ msgstr "" msgid "Unknown error" msgstr "Ukjend feil" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Grјnn" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Raudgul" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Grјnn" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Raudgul" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1177,17 +1159,24 @@ msgid "" "further assistance." msgstr "" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~vbryt" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~astar" @@ -1227,14 +1216,21 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "" @@ -1280,7 +1276,7 @@ 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Avslutt" @@ -1976,11 +1972,11 @@ msgid "Cutscene file '%s' not found!" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "" -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "" @@ -2068,15 +2064,20 @@ msgid "" "Please (re)download it from www.scummvm.org" msgstr "" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "" @@ -2111,6 +2112,11 @@ msgstr "" msgid "This is the end of the Broken Sword 1 Demo" msgstr "" +#: engines/sword2/animation.cpp:435 +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2158,33 +2164,33 @@ msgstr "MAME OPL emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2241,11 +2247,15 @@ msgstr " (Aktivt)" msgid " (Active)" msgstr " (Aktivt)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Spel)" @@ -2325,27 +2335,27 @@ msgstr "" msgid "Disable power off" msgstr "Deaktiver strјmsparing" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "" -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2353,12 +2363,12 @@ msgstr "" msgid "Left Click" msgstr "Venstreklikk" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Midtre venstre gjenstand" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2757,17 +2767,17 @@ msgstr "" "Ikkje glјym х kople ein tast til 'Skjul verktјylinje' for х se heile " "inventaret" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 #, fuzzy msgid "Do you really want to return to the Launcher?" msgstr "Vil du verkeleg slette det lagra spelet?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 #, fuzzy msgid "Launcher" msgstr "Slх" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 #, fuzzy msgid "Do you really want to quit?" msgstr "Vil du avslutte?" @@ -2848,6 +2858,20 @@ msgstr "" msgid "Clicking Disabled" msgstr "" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Grјnn" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Raudgul" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Grјnn" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Raudgul" + #, fuzzy #~ msgid "Save game failed!" #~ msgstr "Lagra spel:" diff --git a/po/pl_PL.po b/po/pl_PL.po index 36aad63180..d74c40f47d 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-10-24 21:14+0100\n" "Last-Translator: MichaГ ZiБbkowski <mziab@o2.pl>\n" "Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n" -"Language: Polski\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Polski\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-Basepath: .\n" "X-Poedit-Language: Polish\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "W gѓrъ" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Anuluj" @@ -72,15 +72,15 @@ msgstr "Zamknij" msgid "Mouse click" msgstr "Klikniъcie" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "WyЖwietl klawiaturъ" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Dostosuj klawisze" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "WГБcz/wyГБcz peГny ekran" @@ -93,16 +93,17 @@ msgstr "Wybierz akcjъ do przypisania" msgid "Map" msgstr "Przypisz" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -130,15 +131,15 @@ msgstr "Wybierz akcjъ" msgid "Press the key to associate" msgstr "WciЖnij klawisz do przypisania" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Gra" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -146,315 +147,315 @@ msgstr "" "Krѓtki identyfikator gry uПywany do rozpoznawania zapisѓw i uruchamiania gry " "z linii komend" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nazwa:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "PeГny tytuГ gry:" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nazwa:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Jъzyk:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ." -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<domyЖlne>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Platforma, na ktѓrБ stworzono grъ" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Platforma:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "Grafika" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "DМwiъk" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "ІcieПka zapisѓw:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "OkreЖla gdzie zapisywaц stan gry" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "ІcieПka zapisѓw:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Brak" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "DomyЖlnie" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Wybierz SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Wybierz katalog z plikami gry" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Wybierz dodatkowy katalog gry" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Wybierz katalog dla zapisѓw" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Identyfikator jest juП zajъty. Wybierz inny." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~Z~akoёcz" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Zakoёcz ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "I~n~formacje..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "KsiБПka ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~pcje..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Zmieё ustawienia ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~tart" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Rozpocznij wybranБ grъ" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~W~czytaj..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Wczytaj zapis wybranej gry" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~D~odaj grъ..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Przytrzymaj Shift, by dodawaц zbiorowo" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~E~dytuj grъ..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Zmieё opcje gry" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~U~suё grъ" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Usuwa grъ z listy. Pliki gry pozostajБ nietkniъte" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~D~odaj grъ..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~dytuj grъ..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~U~suё grъ" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Wyszukaj grъ na liЖcie" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Szukaj" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Wczytaj grъ:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Wczytaj" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." msgstr "" "Chcesz uruchomiц masowy detektor gier? MoПe dodaц wiele tytuГѓw do listy" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -462,7 +463,7 @@ msgstr "" msgid "Yes" msgstr "Tak" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -470,36 +471,36 @@ msgstr "Tak" msgid "No" msgstr "Nie" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nie moПe otworzyц katalogu!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM nie znalazГ Пadnej gry w tym katalogu!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Wybierz grъ:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Na pewno chcesz usunБц tъ grъ z konfiguracji?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Ta gra nie wspiera wczytywania z launchera." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM nie znalazГ silnika zdolnego uruchomiц wybranБ grъ!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Masowe dodawanie..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Masowe dodawanie..." @@ -526,141 +527,141 @@ msgstr "Przeskanowano %d katalogѓw ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Wykryto %d nowych gier, zignorowano %d poprzednio dodanych..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Nigdy" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "co 5 min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "co 10 min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "co 15 min" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "co 30 min" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Brak" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Nie udaГo siъ zastosowaц czъЖci zmian opcji grafiki:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "nie udaГo siъ zmieniц trybu wideo." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "nie udaГo siъ zmieniц formatu obrazu" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Tryb grafiki:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Renderer:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "PeГny ekran" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Korekcja formatu obrazu" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Korekcja formatu obrazu dla gier 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "Anty-dithering EGA" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "WГБcz anty-dithering we wspieranych grach EGA" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 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:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 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:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Emulator AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib jest uПywany do muzyki w wielu grach" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Czъst. wyj.:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -668,63 +669,63 @@ msgstr "" "WyПsze wartoЖci dajБ lepszБ jakoЖц dМwiъku, ale mogБ byц nieobsГugiwane " "przez twojБ kartъ dМwiъkowБ" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "UrzБdzenie GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 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:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Nie uПywaj muzyki General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "UПyj pierwszego dostъpnego urzБdzenia" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Tryb miksowanego AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 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:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Wzm. MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "UrzБdzenie MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -732,191 +733,191 @@ msgstr "" "Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland " "podГБczonej do twojego komputera" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "WГБcz tryb Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "WyГБcza mapowanie General MIDI dla gier ze ЖcieПkБ dМwiъkowБ Roland MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Nie uПywaj muzyki Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Mowa" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Napisy" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Oba" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Mowa" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Napisy" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "WyЖwietlaj napisy i odtwarzaj mowъ" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Wycisz" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "GГoЖnoЖц efektѓw dМw." -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Styl:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Renderer interf.:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Klawisze" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Jъzyk interfejsu:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Jъzyk interfejsu ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Wybierz katalog zapisѓw" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny." -#: gui/options.cpp:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Wybierz katalog dla stylѓw GUI." -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Wybierz katalog dla dodatkowych plikѓw" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Wybierz katalog dla wtyczek" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -998,22 +999,22 @@ msgstr "WyczyЖц" msgid "Engine does not support debug level '%s'" msgstr "Silnik nie wspiera poziomu debugowania '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menu" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Pomiё" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Wstrzymaj" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Pomiё liniъ" @@ -1089,25 +1090,6 @@ msgstr "Przerwane przez uПytkownika" msgid "Unknown error" msgstr "Nieznany bГБd" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Zielony Hercules" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Bursztynowy Hercules" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Zielony Hercules" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Bursztynowy Hercules" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1179,17 +1161,27 @@ msgstr "" "uzyskaц podstawowe informacje oraz dowiedzieц jak szukaц dalszej pomocy, " "sprawdМ plik README." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Przepraszamy, ten silnik obecnie nie oferuje pomocy wewnБtrz gry. Aby " +"uzyskaц podstawowe informacje oraz dowiedzieц jak szukaц dalszej pomocy, " +"sprawdМ plik README." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~nuluj" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~K~lawisze" @@ -1233,7 +1225,17 @@ msgstr "" "skopiowaц na dysk za pomocБ odpowiedniego rippera CD audio.\n" "Dalsze informacje sБ dostъpne w pliku README." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Przepraszamy, ten silnik obecnie nie oferuje pomocy wewnБtrz gry. Aby " +"uzyskaц podstawowe informacje oraz dowiedzieц jak szukaц dalszej pomocy, " +"sprawdМ plik README." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1243,7 +1245,7 @@ msgstr "" "ScummVM. W zwiБzku z tym moПe byц ona niestabilna, a wszelkie zapisy, " "ktѓrych dokonasz, mogБ byц nieobsГugiwane w przyszГych wersjach ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "WГБcz mimo tego" @@ -1287,7 +1289,7 @@ msgstr "Uruchom" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Zakoёcz" @@ -1987,11 +1989,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Nie znaleziono pliku przerywnika '%s'!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Nie udaГo siъ wczytaц stanu gry z pliku." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Nie udaГo siъ zapisaц stanu gry do pliku." @@ -2086,17 +2088,22 @@ msgstr "" "Plik \"sky.cpt\" ma nieprawidГowy rozmiar.\n" "Pobierz go (ponownie) ze strony www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Znaleziono przerywniki w formacie DXA, ale ScummVM jest skompilowany bez " "obsГugi zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Przerywniki w formacie MPEG2 nie sБ juП obsГugiwane" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Nie znaleziono przerywnika '%s'" @@ -2140,6 +2147,14 @@ msgstr "Zachowaj nowy" msgid "This is the end of the Broken Sword 1 Demo" msgstr "To koniec dema Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"Znaleziono przerywniki w formacie DXA, ale ScummVM jest skompilowany bez " +"obsГugi zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2197,7 +2212,7 @@ msgstr "Emulator OPL MAME" msgid "DOSBox OPL emulator" msgstr "Emulator OPL DOSBox" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2206,12 +2221,12 @@ msgstr "" "Nie znaleziono wybranego urzБdzenia audio '%s' (moПe byц wyГБczone albo " "niepodГБczone)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Prѓbujъ uПyц nastъpnego dostъpnego urzБdzenia..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2220,7 +2235,7 @@ msgstr "" "Nie moПna uПyц wybranego urzБdzenia audio '%s'. Dalsze szczegѓГy sБ dostъpne " "w pliku dziennika." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2229,7 +2244,7 @@ msgstr "" "Nie znaleziono preferowanego urzБdzenia audio '%s' (moПe byц wyГБczone albo " "niepodГБczone)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2287,11 +2302,15 @@ msgstr " (Aktywny)" msgid " (Active)" msgstr " (Aktywny)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Globalny)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Gra)" @@ -2371,27 +2390,27 @@ msgstr "DМwiъk wysokiej jakoЖci (wolniejszy) (restart)" msgid "Disable power off" msgstr "Nie wyГБczaj zasilania" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "WГБczono tryb kliknij i przeciБgaj." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "WyГБczono tryb kliknij i przeciБgaj." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Tryb touchpada wГБczony." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Tryb touchpada wyГБczony." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2399,12 +2418,12 @@ msgstr "" msgid "Left Click" msgstr "Klikniъcie LPM" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Przedmiot na Жrodku, z lewej" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2794,15 +2813,15 @@ msgstr "" "Nie zapomnij przypisaц klawisza 'Ukryj pasek narzъdzi', by widzieц caГy " "ekwipunek" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Na pewno chcesz powrѓciц do launchera?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Na pewno chcesz wyjЖц?" @@ -2876,6 +2895,20 @@ msgstr "Klikanie wГБczone" msgid "Clicking Disabled" msgstr "Klikanie wyГБczone" +#~ msgid "Hercules Green" +#~ msgstr "Zielony Hercules" + +#~ msgid "Hercules Amber" +#~ msgstr "Bursztynowy Hercules" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Zielony Hercules" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Bursztynowy Hercules" + #~ msgid "Save game failed!" #~ msgstr "Nie udaГo siъ zapisaц stanu gry!" diff --git a/po/pt_BR.po b/po/pt_BR.po index 34ce904f25..16293a543f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-10-21 21:30-0300\n" "Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n" "Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n" -"Language: Portugues (Brasil)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Portugues (Brasil)\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "Acima" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Cancelar" @@ -72,15 +72,15 @@ msgstr "Fechar" msgid "Mouse click" msgstr "Clique do mouse" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Mostrar teclado" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Remapear teclas" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Habilita Tela Cheia" @@ -93,16 +93,17 @@ msgstr "Selecione uma aчуo para mapear" msgid "Map" msgstr "Mapear" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -130,15 +131,15 @@ msgstr "Por favor selecione uma aчуo" msgid "Press the key to associate" msgstr "Pressione a tecla para associar" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Jogo" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "Cѓdigo:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -146,309 +147,309 @@ msgstr "" "Cѓdigo identificador usado para se referir a jogos salvos e execuчуo do jogo " "a partir da linha de comando" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "Cѓdigo:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Tэtulo completo do jogo" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Nome:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Idioma:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "Idioma do jogo. Isto nуo irс passar seu jogo Inglъs para Portuguъs" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<padrуo>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Sistema:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Sistema que o jogo foi desenvolvido originalmente" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Sistema:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Сudio" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Especifique a pasta para dados utilizados no jogo" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Pasta para Salvar" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Pasta para Salvar" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Nenhum(a)" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Selecione o SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Selecione a pasta com os arquivos do jogo" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Selecione a pasta adicional do jogo" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Selecione a pasta para os jogos salvos" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Este cѓdigo jс esta sendo utilizado. Por favor, escolha outro." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~S~air" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Sair do ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "So~b~re..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Sobre o ScumnmVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~O~pчѕes" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Alterar opчѕes globais do ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~I~niciar" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Iniciar jogo selecionado" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~C~arregar" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Carregar jogo salvo do jogo selecionado" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~A~dicionar Jogo..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Segure Shift para Multi-Adiчуo" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "~E~ditar Jogo..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Alterar opчѕes do jogo" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~R~emover Jogo" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "" "Remover jogo da lista. Os arquivos de dados do jogo permanecem intactos" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~A~dicionar Jogo..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "~E~ditar Jogo..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~R~emover Jogo" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Pesquisar na lista de jogos" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Pesquisar:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Carregar jogo:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Carregar" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -456,7 +457,7 @@ msgstr "" "Vocъ realmente deseja adicionar vсrios jogos ao mesmo tempo? Isso poderс " "resultar em uma adiчуo gigantesca de jogos." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -464,7 +465,7 @@ msgstr "" msgid "Yes" msgstr "Sim" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -472,38 +473,38 @@ msgstr "Sim" msgid "No" msgstr "Nуo" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM nуo conseguiu abrir a pasta especificada!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM nуo encontrou nenhum jogo na pasta especificada!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Escolha o jogo:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Vocъ deseja realmente remover a configuraчуo deste jogo?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Este jogo nуo suporta abrir jogos a partir do menu principal." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM nуo conseguiu encontrar qualquer programa capaz de rodar o jogo " "selecionado!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Multi-Adiчуo..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Multi-Adiчуo..." @@ -534,141 +535,141 @@ msgstr "" "Encontrado(s) %d novo(s) jogo(s, ignorados %d previamente adicionados " "jogos..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "a cada 5 mins" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "a cada 10 mins" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "a cada 15 mins" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "a cada 30 mins" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Nenhum(a)" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Falha ao aplicar algumas mudanчas nas opчѕes de grсfico:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "o modo de vэdeo nуo pєde ser alterado." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "a configuraчуo de tela cheia nуo pєde ser mudada" -#: gui/options.cpp:415 +#: gui/options.cpp:417 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:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Renderizaчуo" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Correчуo de proporчуo" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Correчуo de proporчуo para jogos 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA sem dithering" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Habilita EGA sem dithering em jogos com suporte" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 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:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 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:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib щ utilizado para mњsica em vсrios jogos" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -676,62 +677,62 @@ msgstr "" "Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado " "por sua placa de som" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 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:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Nуo usar mњsica General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Usar o primeiro dispositivo disponэvel" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Mixar AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar MIDI e AdLib juntos na geraчуo de som" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Ganho MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Dispositivo MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -739,193 +740,193 @@ msgstr "" "Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel " "com Roland" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sem emulaчуo GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Ligar modo Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Desliga o mapeamento General MIDI para jogos com trilha sonora Roland MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Nуo usar mњsica Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Legendas" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Rapidez legendas:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Legs" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Mostrar legenda e vozes (dublagem)" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade das legendas:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Mudo" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volume dos efeitos sonoros especiais" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Renderizador GUI:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Idioma do GUI:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Linguagem do ScummVM GUI" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Vocъ tem que reiniciar o ScummVM para funcionar." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Selecione a pasta para o jogos salvos" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Selecione a pasta para os plugins" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1007,22 +1008,22 @@ msgstr "Limpar valor" msgid "Engine does not support debug level '%s'" msgstr "Esse programa nуo suporta o nэvel de debug '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Menu" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Pular" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausar" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Pula linha" @@ -1100,25 +1101,6 @@ msgstr "Usuсrio cancelou" msgid "Unknown error" msgstr "Erro desconhecido" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Green" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Amber" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Green" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Amber" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1191,17 +1173,27 @@ msgstr "" "Por favor, consulte o README para obter informaчѕes bсsicas, e para obter " "instruчѕes sobre como obter assistъncia adicional." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Desculpe, este programa nуo fornece atualmente ajuda internamente no jogo. " +"Por favor, consulte o README para obter informaчѕes bсsicas, e para obter " +"instruчѕes sobre como obter assistъncia adicional." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~C~ancelar" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~eclas" @@ -1249,7 +1241,17 @@ msgstr "" "para ouvir a mњsica do jogo.\n" "Consulte o arquivo README para mais detalhes." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Desculpe, este programa nуo fornece atualmente ajuda internamente no jogo. " +"Por favor, consulte o README para obter informaчѕes bсsicas, e para obter " +"instruчѕes sobre como obter assistъncia adicional." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1259,7 +1261,7 @@ msgstr "" "suportado pelo ScummVM. Como tal, щ provсvel que seja instсvel, e qualquer " "jogo salvo que vocъ fizer pode nуo funcionar em futuras versѕes do ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Iniciar de qualquer maneira" @@ -1303,7 +1305,7 @@ msgstr "Jogar" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Sair" @@ -2005,14 +2007,14 @@ msgid "Cutscene file '%s' not found!" msgstr "Arquivo de vэdeo '%s' nуo encontrado!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "" "Falha ao carregar o estado do jogo a partir do arquivo:\n" "\n" "%s" -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "" "Falha ao salvar o estado do jogo para o arquivo:\n" @@ -2111,17 +2113,22 @@ msgstr "" "O arquivo \"sky.cpt\" possui um tamanho incorreto.\n" "Por favor, refaчa o download em www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Vэdeos no formato DXA foram encontrados, mas o ScummVM foi compilado sem " "suporte a zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Vэdeos em MPEG2 nуo sуo mais suportados" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Vэdeo '%s' nуo encontrado" @@ -2165,6 +2172,14 @@ msgstr "Mantenha o novo" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Este щ o fim do demo de Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"Vэdeos no formato DXA foram encontrados, mas o ScummVM foi compilado sem " +"suporte a zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2223,7 +2238,7 @@ msgstr "Emulador MAME OPL" msgid "DOSBox OPL emulator" msgstr "Emulador DOSBox OPL" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2232,12 +2247,12 @@ msgstr "" "O dispositivo de сudio selecionado '%s' nуo foi encontrado (ex: pode estar " "desligado ou desconectado)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Tentando retornar para o prѓximo dispositivo disponэvel..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2246,7 +2261,7 @@ msgstr "" "O dispositivo de сudio selecionado '%s' nуo pode ser usado. Veja o arquivo " "de log para mais informaчѕes." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2255,7 +2270,7 @@ msgstr "" "O dispositivo de сudio preferido '%s' nуo foi encontrado (ex: pode estar " "desligado ou desconectado)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2313,11 +2328,15 @@ msgstr "(Ativo)" msgid " (Active)" msgstr "(Ativo)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr "(Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr "(Jogo)" @@ -2397,27 +2416,27 @@ msgstr "Som de alta qualidade (mais lento) (reiniciar)" msgid "Disable power off" msgstr "Desativar desligamento" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Modo clique-e-arraste do mouse ligado." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Modo clique-e-arraste do mouse desligado." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Modo Touchpad ligado." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Modo Touchpad desligado." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2425,12 +2444,12 @@ msgstr "" msgid "Left Click" msgstr "Clique com o botуo esquerdo" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Item do meio na esquerda" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2823,15 +2842,15 @@ msgstr "" "Nуo se esqueчa de mapear uma tecla para \"Ocultar a barra de ferramentas\" " "para ver todo o seu inventсrio" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Vocъ realmente deseja voltar para o menu principal?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Menu principal" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Vocъ realmente deseja sair?" @@ -2905,6 +2924,20 @@ msgstr "Clicando Habilitado" msgid "Clicking Disabled" msgstr "Clicando Desabilitado" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Green" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Amber" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Green" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Amber" + #~ msgid "Save game failed!" #~ msgstr "Falha ao salvar jogo!" diff --git a/po/ru_RU.po b/po/ru_RU.po index b14479069c..fe2204f6e5 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2012-02-16 13:09+0200+0200\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" -"Language: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-5\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Language: Russian\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%" +"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: gui/about.cpp:91 #, c-format @@ -45,13 +45,13 @@ msgid "Go up" msgstr "Вверх" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Отмена" @@ -70,15 +70,15 @@ msgstr "Закрыть" msgid "Mouse click" msgstr "Клик мышью" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Показать клавиатуру" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Переназначить клавиши" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 msgid "Toggle FullScreen" msgstr "Переключение на весь экран" @@ -90,16 +90,17 @@ msgstr "Выберите действие для назначения" msgid "Map" msgstr "Назначить" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -127,15 +128,15 @@ msgstr "Пожалуйста, выберите действие" msgid "Press the key to associate" msgstr "Нажмите клавишу для назначения" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Игра" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -143,309 +144,309 @@ msgstr "" "Короткий идентификатор, используемый для имен сохранений игр и для запуска " "из командной строки" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Название:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Полное название игры" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Назв:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Язык:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "" "Язык игры. Изменение этой настройки не превратит игру на английском в русскую" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<по умолчанию>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Платформа, для которой игра была изначально разработана" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Графика" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "Грф" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Аудио" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Громкость" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Громк" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Путь к игре:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Где игра:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Указывает путь к дополнительным файлам данных для игры" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Сохранения игр:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Указывает путь к сохранениям игры" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Путь сохр:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Не задан" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "По умолчанию" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Выберите SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Выберите директорию с файлами игры" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Выберите дополнительную директорию игры" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Выберите директорию для сохранений" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Этот ID игры уже используется. Пожалуйста, выберите другой." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~В~ыход" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Завершить ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "О п~р~ограмме..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "О программе ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~Н~астройки..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Изменить глобальные настройки ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "П~у~ск" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Запустить выбранную игру" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~З~агрузить..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Загрузить сохрнение для выбранной игры" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~Д~обавить игру..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Удерживайте клавишу Shift для того, чтобы добавить несколько игр" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "Н~а~стройки игры..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Изменить настройки игры" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~У~далить игру" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Удалить игру из списка. Не удаляет игру с жесткого диска" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~Д~об. игру..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Н~а~с. игры..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~У~далить игру" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Поиск в списке игр" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Поиск:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Загрузить игру:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Загрузить" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -453,7 +454,7 @@ msgstr "" "Вы действительно хотите запустить детектор всех игр? Это потенциально может " "добавить большое количество игр." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -461,7 +462,7 @@ msgstr "" msgid "Yes" msgstr "Да" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -469,36 +470,36 @@ msgstr "Да" msgid "No" msgstr "Нет" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM не может открыть указанную директорию!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM не может найти игру в указанной директории!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Выберите игру:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Вы действительно хотите удалить настройки для этой игры?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Эта игра не поддерживает загрузку сохранений через главное меню." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM не смог найти движок для запуска выбранной игры!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Много игр..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Много игр..." @@ -525,144 +526,144 @@ msgstr "Просмотрено %d директорий ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Найдено %d новых игр, пропущено %d ранее добавленных игр ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Никогда" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "каждые 5 минут" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "каждые 10 минут" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "каждые 15 минут" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "каждые 30 минут" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Не задан" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Не удалось применить изменения некторых графических настроек:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "видеорежим не может быть изменён." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "полноэкранный режим не может быть изменён" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "режим корректировки соотношения сторон не может быть изменён" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Граф. режим:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Режим растра:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Полноэкранный режим" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Коррекция соотношения сторон" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Корректировать соотношение сторон для игр с разрешением 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA без растра" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "" "Включает режим без растрирования в EGA играх, которые поддерживают такой " "режим" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Предпочитаемое:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Предпочитаемое:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Эмулятор AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "Звуковая карта AdLib используется многими играми" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Частота звука:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -670,64 +671,64 @@ msgstr "" "БОльшие значения задают лучшее качество звука, однако они могут не " "поддерживаться вашей звуковой картой" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Устройство GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Указывает выходное звуковое устройство для MIDI" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Не использовать музыку для General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Использовать первое доступное устройство" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFontы поддердживаются некоторыми звуковыми картами, Fluidsynth и " "Timidity" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Смешанный режим AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Использовать и MIDI и AdLib для генерации звука" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Усиление MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Устр. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Указывает звуковое устройство по умолчания для вывода на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -735,193 +736,193 @@ msgstr "" "Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы " "хотите его использовать" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Настоящий Roland MT-32 (запретить GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Включить режим Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Выключает маппинг General MIDI для игр с звуковой дорожкой для Roland MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Не использовать музыку для MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Субтитры" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Оба" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Оба" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Показывать субтитры и воспроизводить речь" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Выкл. всё" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Громкость SFX:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Громкость специальных звуковых эффектов" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Громк. SFX:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Путь к темам:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Где темы:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Указывает путь к дополнительным файлам данных, используемых всеми играми, " "либо ScummVM" -#: gui/options.cpp:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Рисовалка GUI:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Автосохранение:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Автосохр.:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Клавиши" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Язык GUI:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Язык графического интерфейса ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы должны перезапустить ScummVM чтобы применить изменения." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Выберите директорию для сохранений" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую." -#: gui/options.cpp:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Выберите директорию для тем GUI" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Выберите директорию с дополнительными файлами" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Выберите директорию с плагинами" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1003,22 +1004,22 @@ msgstr "Очистить значение" msgid "Engine does not support debug level '%s'" msgstr "Движок не поддерживает уровень отладки '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Меню" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Пропустить" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Пауза" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Пропустить строку" @@ -1094,25 +1095,6 @@ msgstr "Прервано пользователем" msgid "Unknown error" msgstr "Неизвестная ошибка" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Зелёный" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Янтарный" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Зелёный" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Янтарный" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1185,17 +1167,27 @@ msgstr "" "Пожалуйста, обратитесь в файл README за базовой информацией, а также " "инструкциями о том, как получить дальнейшую помощь." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Просим прощения, но этот движое пока не предоставляет помощи внутри игры. " +"Пожалуйста, обратитесь в файл README за базовой информацией, а также " +"инструкциями о том, как получить дальнейшую помощь." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "О~т~мена" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~К~лавиши" @@ -1244,7 +1236,17 @@ msgstr "" "появится музыка. Подробности можно найти в\n" "файле README." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Просим прощения, но этот движое пока не предоставляет помощи внутри игры. " +"Пожалуйста, обратитесь в файл README за базовой информацией, а также " +"инструкциями о том, как получить дальнейшую помощь." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1254,7 +1256,7 @@ msgstr "" "ScummVM полностью. Она скорее всего не будет работать стабильно, и " "сохранения игр могут не работать в будущих версиях ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Всё равно запустить" @@ -1298,7 +1300,7 @@ 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Выход" @@ -1997,11 +1999,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Файл заставки '%s' не найден!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Не удалось загрузить сохранённую игру из файла." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Не удалось сохранить игру в файл." @@ -2092,16 +2094,21 @@ msgstr "" "Файл sky.cpt имеет неверный размер.\n" "Пожалуйста, скачайте его заново с www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" "Найдены заставки в формате DXA, но ScummVM был собран без поддержки zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Заставки в формате MPEG2 больше не поддерживаются" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Заставка '%s' не найдена" @@ -2144,6 +2151,13 @@ msgstr "Сделать новое" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Это завершение демо Сломанного Меча 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" +"Найдены заставки в формате DXA, но ScummVM был собран без поддержки zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2201,7 +2215,7 @@ msgstr "Эмулятор MAME OPL" msgid "DOSBox OPL emulator" msgstr "Эмулятор DOSBox OPL" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2210,12 +2224,12 @@ msgstr "" "Выбранное звуковое устройство '%s' не было найдено (возможно оно выключено " "или не подключено)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Пытаюсь использовать другое доступное устройство..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2224,7 +2238,7 @@ msgstr "" "Выбранное звуковое устройство '%s' не может быть использовано. Смотрите файл " "протокола для более подробной информации." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2233,7 +2247,7 @@ msgstr "" "Предпочтительное звуковое устройство '%s' не было найдено (возможно оно " "выключено или не подключено)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2290,11 +2304,15 @@ msgstr " (Действующая)" msgid " (Active)" msgstr " (Активная)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Глобальная)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Игры)" @@ -2374,27 +2392,27 @@ msgstr "Высокое качество звука (медленнее) (ребут)" msgid "Disable power off" msgstr "Запретить выключение" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Режим мыши нажать-и-тянуть включен." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Режим мыши нажать-и-тянуть выключен." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Режим тачпада включен." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Режим тачпада выключен." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "Режим щелчка" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2402,11 +2420,11 @@ msgstr "Режим щелчка" msgid "Left Click" msgstr "Левый щелчок" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 msgid "Middle Click" msgstr "Средний щелчок" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2796,15 +2814,15 @@ msgstr "" "Не забудьте назначить клавишу для действия 'Hide Toolbar' чтобы увидеть весь " "инвентарь в игре" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Вы действительно хотите вернуться в главное меню?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Главное меню" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Вы действительно хотите выйти?" @@ -2878,6 +2896,20 @@ msgstr "Щелчки включены" msgid "Clicking Disabled" msgstr "Щелчки выключены" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Зелёный" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Янтарный" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Зелёный" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Янтарный" + #~ msgid "Save game failed!" #~ msgstr "Не удалось сохранить игру!" diff --git a/po/scummvm.pot b/po/scummvm.pot index 750d5fec1d..989779fc91 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,13 +43,13 @@ msgid "Go up" msgstr "" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "" @@ -69,15 +68,15 @@ msgstr "" msgid "Mouse click" msgstr "" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 msgid "Toggle FullScreen" msgstr "" @@ -89,16 +88,17 @@ msgstr "" msgid "Map" msgstr "" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -126,328 +126,328 @@ msgstr "" msgid "Press the key to associate" msgstr "" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" msgstr "" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" msgstr "" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "" -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "" -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "" -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "" -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "" -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "" -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." msgstr "" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -455,7 +455,7 @@ msgstr "" msgid "Yes" msgstr "" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -463,36 +463,36 @@ msgstr "" msgid "No" msgstr "" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "" -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "" @@ -519,389 +519,389 @@ msgstr "" msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 msgid "You have to restart ScummVM before your changes will take effect." msgstr "" -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -981,22 +981,22 @@ msgstr "" msgid "Engine does not support debug level '%s'" msgstr "" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "" @@ -1072,25 +1072,6 @@ msgstr "" msgid "Unknown error" msgstr "" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1159,17 +1140,24 @@ msgid "" "further assistance." msgstr "" -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "" @@ -1207,14 +1195,21 @@ msgid "" "See the README file for details." msgstr "" -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "" @@ -1258,7 +1253,7 @@ 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "" @@ -1943,11 +1938,11 @@ msgid "Cutscene file '%s' not found!" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "" -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "" @@ -2028,15 +2023,20 @@ msgid "" "Please (re)download it from www.scummvm.org" msgstr "" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "" @@ -2071,6 +2071,11 @@ msgstr "" msgid "This is the end of the Broken Sword 1 Demo" msgstr "" +#: engines/sword2/animation.cpp:435 +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2116,33 +2121,33 @@ msgstr "" msgid "DOSBox OPL emulator" msgstr "" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2197,11 +2202,15 @@ msgstr "" msgid " (Active)" msgstr "" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr "" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr "" @@ -2281,27 +2290,27 @@ msgstr "" msgid "Disable power off" msgstr "" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "" -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "" -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2309,11 +2318,11 @@ msgstr "" msgid "Left Click" msgstr "" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 msgid "Middle Click" msgstr "" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2701,15 +2710,15 @@ msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "" diff --git a/po/se_SE.po b/po/se_SE.po index 41bda1dd8a..812852ca53 100644 --- a/po/se_SE.po +++ b/po/se_SE.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2011-11-27 19:00+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" -"Language: Svenska\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Svenska\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: SWEDEN\n" @@ -47,13 +47,13 @@ msgid "Go up" msgstr "Uppхt" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" @@ -72,15 +72,15 @@ msgstr "Stфng" msgid "Mouse click" msgstr "Musklick" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Visa tangentbord" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Stфll in tangenter" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 #, fuzzy msgid "Toggle FullScreen" msgstr "Fullskфrmslфge" @@ -93,16 +93,17 @@ msgstr "Vфlj en handling att stфlla in" msgid "Map" msgstr "Stфll in" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -130,15 +131,15 @@ msgstr "Var god vфlj en handling" msgid "Press the key to associate" msgstr "Tryck pх en tangent fіr att stфlla in" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Spel" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -146,29 +147,29 @@ msgstr "" "Kortnamn fіr spel. Anvфnds fіr att hфnvisa till spardata och att starta " "spelet frхn kommandoraden" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Spelets fullstфndiga titel" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Namn:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Sprхk:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -176,280 +177,280 @@ msgstr "" "Spelets sprхk. Den hфr instфllningen omvandlar inte din spanska spelversion " "till en engelsk" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<standard>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Plattformen spelet ursprungligen tillverkades fіr" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "GFX" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Ljud" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Bestфmmer sіkvфgen till ytterligare data som spelet anvфnder" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Sіkv. sparat:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Bestфmmer var dina spardata lagras" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Sіkv. sparat:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Vфlj SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Vфlj katalog med speldata" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Vфlj en ytterligare spelkatalog" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Vфlj katalog fіr spardata" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Detta ID-namn фr upptaget. Var god vфlj ett annat." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vsluta" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Avsluta ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "O~m~..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~I~nstфllningar..." -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Redigera globala ScummVM-instфllningar" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "~S~tarta" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Starta det valda spelet" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~L~adda..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Ladda spardata fіr det valda spelet" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "Lф~g~g till spel..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Hхll ned Skift fіr masstillфgg" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "R~e~digera spel..." -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Redigera spelinstфllningarna" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~R~adera spel" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Radera spelet frхn listan. Spelets datafiler pхverkas inte." -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "Lф~g~g till spel..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "R~e~digera spel..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~R~adera spel" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Sіk i spellistan" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Sіk:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Ladda spel:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Ladda" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -457,7 +458,7 @@ msgstr "" "Vill du verkligen anvфnda mass-speldetektorn? Processen kan potentiellt " "lфgga till ett enormt antal spel." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -465,7 +466,7 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -473,37 +474,37 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM kunde inte іppna den valda katalogen!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM kunde inte hitta nхgra spel i den valda katalogen!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Vфlj spel:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Vill du verkligen radera den hфr spelkonfigurationen?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Det hфr spelet stіder inte laddning av spardata frхn launchern." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "" "ScummVM kunde inte hitta en motor kapabel till att kіra det valda spelet!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Masstillфgg..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Masstillфgg..." @@ -530,141 +531,141 @@ msgstr "Kataloger scannade: %d ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Upptфckte %d nya spel, ignorerade %d tidigare tillagda spel ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "var 5:e minut" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "var 10:e minut" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "var 15:e minut" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "var 30:e minut" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Kunde inte verkstфlla nхgra av grafikinstфllningarna:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "videolфget kunde inte фndras." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "fullskфrmsinstфllningen kunde inte фndras." -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras." -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Grafiklфge:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Renderingslфge:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlфgen stіdda av vissa spel" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Fullskфrmslфge" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Korrektion av bildfіrhхllande" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrigerar bildfіrhхllanden fіr 320x200-spel" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA anti-gitter" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Aktiverar anti-gitter i EGA spel som stіder det" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Fіredragen enhet:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fіredr. enhet:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "AdLib anvфnds fіr musik i mхnga spel" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Ljudfrekvens:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -672,61 +673,61 @@ msgstr "" "Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt " "ljudkort" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Anvфnd inte General MIDI-musik" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Anvфnd fіrsta tillgфngliga enhet" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 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:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Blandat AdLib/MIDI-lфge" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "MT-32 enhet:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 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:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -734,193 +735,193 @@ msgstr "" "Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-" "anslutna ljudenhet" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Фkta Roland MT-32 (ingen GM-emulation)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Aktivera Roland GS-lфge" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Stфnger av General MIDI-kartlфggning fіr spel med Roland MT-32 soundtrack" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Anvфnd inte Roland MT-32 musik" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Undertext och tal:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Tal" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Undertexter" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Bхda" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text och tal:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Tal" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Text" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Bхda" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Visa undertexter och spela upp tal" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Ljud av" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Volym fіr specialeffekter" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 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:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "GUI-rendering:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Tangenter" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 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:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Vфlj katalog fіr spardata" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 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:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Vфlj katalog fіr GUI-teman" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Vфlj katalog fіr extra filer" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Vфlj katalog fіr tillфgg" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1002,22 +1003,22 @@ msgstr "Tіm sіkfфltet" msgid "Engine does not support debug level '%s'" msgstr "Motorn stіder inte debug-nivх '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Meny" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Skippa" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Paus" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Skippa rad" @@ -1093,25 +1094,6 @@ msgstr "Avbrutit av anvфndaren" msgid "Unknown error" msgstr "Okфnt fel" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Herkules grіn" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Herkules bфrnsten" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Herkules grіn" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Herkules bфrnsten" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1184,17 +1166,27 @@ msgstr "" "hфnvisa till README-filen fіr information och instruktioner fіr att fх " "ytterligare assistens." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Tyvфrr stіder fіr tillfфllet inte den hфr motorn hjфlp-funktionen. Var god " +"hфnvisa till README-filen fіr information och instruktioner fіr att fх " +"ytterligare assistens." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "A~v~bryt" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~T~angenter" @@ -1242,7 +1234,17 @@ msgstr "" "fіr att kunna lyssna pх spelets musik.\n" "Se README-filen fіr detaljer." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Tyvфrr stіder fіr tillfфllet inte den hфr motorn hjфlp-funktionen. Var god " +"hфnvisa till README-filen fіr information och instruktioner fіr att fх " +"ytterligare assistens." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1252,7 +1254,7 @@ msgstr "" "ScummVM. Dфrfіr фr det troligtvis instabilt och om du skapar spardata kan de " "mіjligtvis vara inkompatibla med framtida versioner av ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Starta фndх" @@ -1296,7 +1298,7 @@ msgstr "Spela" #: 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Avsluta" @@ -1996,11 +1998,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Filmscensfilen '%s' hittades ej!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Kunde inte lфsa spardata frхn filen" -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Kunde inte skriva spardata till filen." @@ -2090,15 +2092,20 @@ msgstr "" "Filen \"sky.cpt\" har inkorrekt filstorlek.\n" "Var god ladda hem den igen frхn www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "DXA filmscener hittades men ScummVM har byggts utan stіd fіr zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "MPEG2 filmscener stіds inte lфngre" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Filmscenen '%s' hittades ej" @@ -2142,6 +2149,12 @@ msgstr "Behхll den nya" msgid "This is the end of the Broken Sword 1 Demo" msgstr "Hфr slutar Broken Sword 1 demon" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "DXA filmscener hittades men ScummVM har byggts utan stіd fіr zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2200,7 +2213,7 @@ msgstr "MAME OPL-emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL-emulator" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2209,12 +2222,12 @@ msgstr "" "Den valda ljudenheten '%s' kunde inte hittas (mіjligtvis avstфngd eller " "frхnkopplad)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Fіrsіker anvфnda nфsta tillgфngliga ljudenhet..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2223,7 +2236,7 @@ msgstr "" "Den valda ljudenheten '%s' kan inte anvфndas. Se loggfilen fіr mer " "information." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2232,7 +2245,7 @@ msgstr "" "Den fіredragna ljudenheten '%s' kunde inte hittas (mіjligtvis avstфngd eller " "frхnkopplad)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2290,11 +2303,15 @@ msgstr "(Aktiv)" msgid " (Active)" msgstr "(Aktiv)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr "(Global)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr "(Spel)" @@ -2374,27 +2391,27 @@ msgstr "Hіg ljudkvalitet (lхngsammare) (omstart)" msgid "Disable power off" msgstr "Inaktivera strіmsparning" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Dra-och-slфpp-lфge med mus aktiverat." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Dra-och-slфpp-lфge med mus deaktiverat." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Touchpad-lфge aktiverat." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Touchpad-lфge inaktiverat." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2402,12 +2419,12 @@ msgstr "" msgid "Left Click" msgstr "Vфnsterklick" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 #, fuzzy msgid "Middle Click" msgstr "Mellersta vфnstra fіremхlet" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2800,15 +2817,15 @@ msgstr "" "Glіm inte att vфlja en tangent fіr \"Gіm verktygsrad\" fіr att se hela " "inventariet" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Vill du verkligen хtergх till launchern?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Launcher" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" @@ -2882,6 +2899,20 @@ msgstr "Klickning aktiverad" msgid "Clicking Disabled" msgstr "Klickning deaktiverad" +#~ msgid "Hercules Green" +#~ msgstr "Herkules grіn" + +#~ msgid "Hercules Amber" +#~ msgstr "Herkules bфrnsten" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Herkules grіn" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Herkules bфrnsten" + #, fuzzy #~ msgid "Save game failed!" #~ msgstr "Spara spelet:" diff --git a/po/uk_UA.po b/po/uk_UA.po index db0c7153a6..3971b29f6e 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-02-16 12:32+0200\n" +"POT-Creation-Date: 2012-03-07 22:09+0000\n" "PO-Revision-Date: 2012-02-16 13:09+0200\n" "Last-Translator: Eugene Sandulenko\n" "Language-Team: Ukrainian\n" -"Language: Ukrainian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-5\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Language: Ukrainian\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%" +"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: gui/about.cpp:91 #, c-format @@ -45,13 +45,13 @@ msgid "Go up" msgstr "Вгору" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221 +#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 -#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 -#: backends/events/default/default-events.cpp:222 -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:191 +#: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Відміна" @@ -70,15 +70,15 @@ msgstr "Закрити" msgid "Mouse click" msgstr "Клік мишкою" -#: gui/gui-manager.cpp:121 base/main.cpp:289 +#: gui/gui-manager.cpp:122 base/main.cpp:288 msgid "Display keyboard" msgstr "Показати клавіатуру" -#: gui/gui-manager.cpp:124 base/main.cpp:292 +#: gui/gui-manager.cpp:126 base/main.cpp:292 msgid "Remap keys" msgstr "Перепризначити клавіші" -#: gui/gui-manager.cpp:127 base/main.cpp:295 +#: gui/gui-manager.cpp:129 base/main.cpp:295 msgid "Toggle FullScreen" msgstr "Перемкнути повноекранний режим" @@ -90,16 +90,17 @@ msgstr "Виберіть дію для призначення" msgid "Map" msgstr "Призначити" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959 -#: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960 +#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254 #: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 #: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449 -#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389 -#: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -127,15 +128,15 @@ msgstr "Будь ласка, виберіть дію" msgid "Press the key to associate" msgstr "Натисніть клавішу для призначення" -#: gui/launcher.cpp:169 +#: gui/launcher.cpp:170 msgid "Game" msgstr "Гра" -#: gui/launcher.cpp:173 +#: gui/launcher.cpp:174 msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:173 gui/launcher.cpp:175 gui/launcher.cpp:176 +#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177 msgid "" "Short game identifier used for referring to savegames and running the game " "from the command line" @@ -143,29 +144,29 @@ msgstr "" "Короткий ідентифікатор, який використовується для назв збережених ігор і для " "запуску з командної стрічки" -#: gui/launcher.cpp:175 +#: gui/launcher.cpp:176 msgctxt "lowres" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:180 +#: gui/launcher.cpp:181 msgid "Name:" msgstr "Назва:" -#: gui/launcher.cpp:180 gui/launcher.cpp:182 gui/launcher.cpp:183 +#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184 msgid "Full title of the game" msgstr "Повна назва гри" -#: gui/launcher.cpp:182 +#: gui/launcher.cpp:183 msgctxt "lowres" msgid "Name:" msgstr "Назва:" -#: gui/launcher.cpp:186 +#: gui/launcher.cpp:187 msgid "Language:" msgstr "Мова:" -#: gui/launcher.cpp:186 gui/launcher.cpp:187 +#: gui/launcher.cpp:187 gui/launcher.cpp:188 msgid "" "Language of the game. This will not turn your Spanish game version into " "English" @@ -173,280 +174,280 @@ msgstr "" "Мова гри. Зміна цього налаштування не перетворить гру англійською на " "українську" -#: gui/launcher.cpp:188 gui/launcher.cpp:202 gui/options.cpp:78 -#: gui/options.cpp:743 gui/options.cpp:753 gui/options.cpp:1192 +#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80 +#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224 #: audio/null.cpp:40 msgid "<default>" msgstr "<за умовчанням>" -#: gui/launcher.cpp:198 +#: gui/launcher.cpp:199 msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202 msgid "Platform the game was originally designed for" msgstr "Платформа, для якої гру було розроблено початково" -#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgctxt "lowres" msgid "Platform:" msgstr "Платформа:" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:212 gui/options.cpp:1055 gui/options.cpp:1072 +#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104 msgid "GFX" msgstr "Грф" -#: gui/launcher.cpp:215 +#: gui/launcher.cpp:216 msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:217 +#: gui/launcher.cpp:218 msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:224 gui/options.cpp:1078 +#: gui/launcher.cpp:225 gui/options.cpp:1110 msgid "Audio" msgstr "Аудіо" -#: gui/launcher.cpp:227 +#: gui/launcher.cpp:228 msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:229 +#: gui/launcher.cpp:230 msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:238 gui/options.cpp:1083 +#: gui/launcher.cpp:239 gui/options.cpp:1115 msgid "Volume" msgstr "Гучність" -#: gui/launcher.cpp:240 gui/options.cpp:1085 +#: gui/launcher.cpp:241 gui/options.cpp:1117 msgctxt "lowres" msgid "Volume" msgstr "Гучн." -#: gui/launcher.cpp:243 +#: gui/launcher.cpp:244 msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:245 +#: gui/launcher.cpp:246 msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:253 gui/options.cpp:1093 +#: gui/launcher.cpp:254 gui/options.cpp:1125 msgid "MIDI" msgstr "MIDI" -#: gui/launcher.cpp:256 +#: gui/launcher.cpp:257 msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:258 +#: gui/launcher.cpp:259 msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:267 gui/options.cpp:1099 +#: gui/launcher.cpp:268 gui/options.cpp:1131 msgid "MT-32" msgstr "MT-32" -#: gui/launcher.cpp:270 +#: gui/launcher.cpp:271 msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:272 +#: gui/launcher.cpp:273 msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:281 gui/options.cpp:1106 +#: gui/launcher.cpp:282 gui/options.cpp:1138 msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:283 gui/options.cpp:1108 +#: gui/launcher.cpp:284 gui/options.cpp:1140 msgctxt "lowres" msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:290 +#: gui/launcher.cpp:291 msgid "Game Path:" msgstr "Шлях до гри:" -#: gui/launcher.cpp:292 +#: gui/launcher.cpp:293 msgctxt "lowres" msgid "Game Path:" msgstr "Шлях до гри:" -#: gui/launcher.cpp:297 gui/options.cpp:1132 +#: gui/launcher.cpp:298 gui/options.cpp:1164 msgid "Extra Path:" msgstr "Додатк. шлях:" -#: gui/launcher.cpp:297 gui/launcher.cpp:299 gui/launcher.cpp:300 +#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301 msgid "Specifies path to additional data used the game" msgstr "Вказує шлях до додаткових файлів даних для гри" -#: gui/launcher.cpp:299 gui/options.cpp:1134 +#: gui/launcher.cpp:300 gui/options.cpp:1166 msgctxt "lowres" msgid "Extra Path:" msgstr "Дод. шлях:" -#: gui/launcher.cpp:306 gui/options.cpp:1116 +#: gui/launcher.cpp:307 gui/options.cpp:1148 msgid "Save Path:" msgstr "Шлях збер.:" -#: gui/launcher.cpp:306 gui/launcher.cpp:308 gui/launcher.cpp:309 -#: gui/options.cpp:1116 gui/options.cpp:1118 gui/options.cpp:1119 +#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310 +#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 msgid "Specifies where your savegames are put" msgstr "Вказує шлях до збережень гри" -#: gui/launcher.cpp:308 gui/options.cpp:1118 +#: gui/launcher.cpp:309 gui/options.cpp:1150 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях збер.:" -#: gui/launcher.cpp:328 gui/launcher.cpp:415 gui/launcher.cpp:468 -#: gui/launcher.cpp:522 gui/options.cpp:1127 gui/options.cpp:1135 -#: gui/options.cpp:1144 gui/options.cpp:1251 gui/options.cpp:1257 -#: gui/options.cpp:1265 gui/options.cpp:1295 gui/options.cpp:1301 -#: gui/options.cpp:1308 gui/options.cpp:1401 gui/options.cpp:1404 -#: gui/options.cpp:1416 +#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469 +#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167 +#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289 +#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333 +#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436 +#: gui/options.cpp:1448 msgctxt "path" msgid "None" msgstr "Не завданий" -#: gui/launcher.cpp:333 gui/launcher.cpp:421 gui/launcher.cpp:526 -#: gui/options.cpp:1245 gui/options.cpp:1289 gui/options.cpp:1407 +#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527 +#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "За умовчанням" -#: gui/launcher.cpp:461 gui/options.cpp:1410 +#: gui/launcher.cpp:462 gui/options.cpp:1442 msgid "Select SoundFont" msgstr "Виберіть SoundFont" -#: gui/launcher.cpp:480 gui/launcher.cpp:635 +#: gui/launcher.cpp:481 gui/launcher.cpp:636 msgid "Select directory with game data" msgstr "Виберіть папку з файлами гри" -#: gui/launcher.cpp:498 +#: gui/launcher.cpp:499 msgid "Select additional game directory" msgstr "Виберіть додаткову папку гри" -#: gui/launcher.cpp:510 +#: gui/launcher.cpp:511 msgid "Select directory for saved games" msgstr "Виберіть папку для збережень" -#: gui/launcher.cpp:537 +#: gui/launcher.cpp:538 msgid "This game ID is already taken. Please choose another one." msgstr "Цей ID гри вже використовується. Будь ласка, виберіть інший." -#: gui/launcher.cpp:578 engines/dialogs.cpp:110 +#: gui/launcher.cpp:579 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~В~ихід" -#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Вихід зі ScummVM" -#: gui/launcher.cpp:579 +#: gui/launcher.cpp:580 msgid "A~b~out..." msgstr "Про п~р~ограму..." -#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Про ScummVM" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "~O~ptions..." msgstr "~Н~алаштування" -#: gui/launcher.cpp:580 +#: gui/launcher.cpp:581 msgid "Change global ScummVM options" msgstr "Змінити глобальні налаштування ScummVM" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "~S~tart" msgstr "З~а~пуск" -#: gui/launcher.cpp:582 +#: gui/launcher.cpp:583 msgid "Start selected game" msgstr "Запустити вибрану гру" -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "~L~oad..." msgstr "~З~авантажити..." -#: gui/launcher.cpp:585 +#: gui/launcher.cpp:586 msgid "Load savegame for selected game" msgstr "Завантажити збереження для вибраної гри" -#: gui/launcher.cpp:590 gui/launcher.cpp:1078 +#: gui/launcher.cpp:591 gui/launcher.cpp:1079 msgid "~A~dd Game..." msgstr "~Д~одати гру..." -#: gui/launcher.cpp:590 gui/launcher.cpp:597 +#: gui/launcher.cpp:591 gui/launcher.cpp:598 msgid "Hold Shift for Mass Add" msgstr "Утримуйте клавішу Shift для того, щоб додати декілька ігор" -#: gui/launcher.cpp:592 +#: gui/launcher.cpp:593 msgid "~E~dit Game..." msgstr "Реда~г~увати гру" -#: gui/launcher.cpp:592 gui/launcher.cpp:599 +#: gui/launcher.cpp:593 gui/launcher.cpp:600 msgid "Change game options" msgstr "Змінити налаштування гри" -#: gui/launcher.cpp:594 +#: gui/launcher.cpp:595 msgid "~R~emove Game" msgstr "~В~идалити гру" -#: gui/launcher.cpp:594 gui/launcher.cpp:601 +#: gui/launcher.cpp:595 gui/launcher.cpp:602 msgid "Remove game from the list. The game data files stay intact" msgstr "Видалити гру зі списку. Не видаляє гру з жорсткого диску" -#: gui/launcher.cpp:597 gui/launcher.cpp:1078 +#: gui/launcher.cpp:598 gui/launcher.cpp:1079 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~Д~одати гру..." -#: gui/launcher.cpp:599 +#: gui/launcher.cpp:600 msgctxt "lowres" msgid "~E~dit Game..." msgstr "Реда~г~. гру..." -#: gui/launcher.cpp:601 +#: gui/launcher.cpp:602 msgctxt "lowres" msgid "~R~emove Game" msgstr "~В~идалити гру" -#: gui/launcher.cpp:609 +#: gui/launcher.cpp:610 msgid "Search in game list" msgstr "Пошук у списку ігор" -#: gui/launcher.cpp:613 gui/launcher.cpp:1125 +#: gui/launcher.cpp:614 gui/launcher.cpp:1126 msgid "Search:" msgstr "Пошук:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216 msgid "Load game:" msgstr "Завантажити гру:" -#: gui/launcher.cpp:638 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 #: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 #: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Завантажити" -#: gui/launcher.cpp:746 +#: gui/launcher.cpp:747 msgid "" "Do you really want to run the mass game detector? This could potentially add " "a huge number of games." @@ -454,7 +455,7 @@ msgstr "" "Чи ви дійсно хочете запустити пошук усіх ігор? Це потенційно може додати " "велику кількість ігор." -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -462,7 +463,7 @@ msgstr "" msgid "Yes" msgstr "Так" -#: gui/launcher.cpp:747 gui/launcher.cpp:895 +#: gui/launcher.cpp:748 gui/launcher.cpp:896 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -470,36 +471,36 @@ msgstr "Так" msgid "No" msgstr "Ні" -#: gui/launcher.cpp:795 +#: gui/launcher.cpp:796 msgid "ScummVM couldn't open the specified directory!" msgstr "ScummVM не може відкрити вказану папку!" -#: gui/launcher.cpp:807 +#: gui/launcher.cpp:808 msgid "ScummVM could not find any game in the specified directory!" msgstr "ScummVM не може знайти гру у вказаній папці!" -#: gui/launcher.cpp:821 +#: gui/launcher.cpp:822 msgid "Pick the game:" msgstr "Виберіть гру:" -#: gui/launcher.cpp:895 +#: gui/launcher.cpp:896 msgid "Do you really want to remove this game configuration?" msgstr "Ви дійсно хочете видалити установки для цієї гри?" -#: gui/launcher.cpp:959 +#: gui/launcher.cpp:960 msgid "This game does not support loading games from the launcher." msgstr "Ця гра не підтримує завантаження збережень через головне меню." -#: gui/launcher.cpp:963 +#: gui/launcher.cpp:964 msgid "ScummVM could not find any engine capable of running the selected game!" msgstr "ScummVM не зміг знайти движок для запуску вибраної гри!" -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgctxt "lowres" msgid "Mass Add..." msgstr "Дод. багато..." -#: gui/launcher.cpp:1077 +#: gui/launcher.cpp:1078 msgid "Mass Add..." msgstr "Дод. багато..." @@ -526,141 +527,141 @@ msgstr "Проглянуто %d папок ..." msgid "Discovered %d new games, ignored %d previously added games ..." msgstr "Знайдено %d нових ігор, пропущено %d попередньо доданих ігор ..." -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "Never" msgstr "Ніколи" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 5 mins" msgstr "кожні 5 хв" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 10 mins" msgstr "кожні 10 хв" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 15 mins" msgstr "кожні 15 хв" -#: gui/options.cpp:76 +#: gui/options.cpp:78 msgid "every 30 mins" msgstr "кожні 30 хв" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "11kHz" msgstr "11 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:78 +#: gui/options.cpp:80 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:483 gui/options.cpp:584 -#: gui/options.cpp:657 gui/options.cpp:861 +#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586 +#: gui/options.cpp:659 gui/options.cpp:868 msgctxt "soundfont" msgid "None" msgstr "Не заданий" -#: gui/options.cpp:391 +#: gui/options.cpp:393 msgid "Failed to apply some of the graphic options changes:" msgstr "Не вдалося застосувати деякі зі змін графічних налаштувань:" -#: gui/options.cpp:403 +#: gui/options.cpp:405 msgid "the video mode could not be changed." msgstr "не вдалося змінити графічний режим." -#: gui/options.cpp:409 +#: gui/options.cpp:411 msgid "the fullscreen setting could not be changed" msgstr "не вдалося змінити режим повного екрану" -#: gui/options.cpp:415 +#: gui/options.cpp:417 msgid "the aspect ratio setting could not be changed" msgstr "не вдалося змінити режим корекції співвідношення сторін" -#: gui/options.cpp:740 +#: gui/options.cpp:742 msgid "Graphics mode:" msgstr "Графічн. режим:" -#: gui/options.cpp:751 +#: gui/options.cpp:756 msgid "Render mode:" msgstr "Режим раструв.:" -#: gui/options.cpp:751 gui/options.cpp:752 +#: gui/options.cpp:756 gui/options.cpp:757 msgid "Special dithering modes supported by some games" msgstr "Спеціальні режими растрування, які підтримують деякі ігри" -#: gui/options.cpp:761 +#: gui/options.cpp:768 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:472 msgid "Fullscreen mode" msgstr "Повноекранний режим" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Aspect ratio correction" msgstr "Корекція співвідношення сторін" -#: gui/options.cpp:764 +#: gui/options.cpp:771 msgid "Correct aspect ratio for 320x200 games" msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "EGA undithering" msgstr "EGA без растрування" -#: gui/options.cpp:765 +#: gui/options.cpp:772 msgid "Enable undithering in EGA games that support it" msgstr "Вімкнути растрування в EGA іграх які це підтримують" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Preferred Device:" msgstr "Уподобаний пристрій:" -#: gui/options.cpp:773 +#: gui/options.cpp:780 msgid "Music Device:" msgstr "Музич. пристрій:" -#: gui/options.cpp:773 gui/options.cpp:775 +#: gui/options.cpp:780 gui/options.cpp:782 msgid "Specifies preferred sound device or sound card emulator" msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:773 gui/options.cpp:775 gui/options.cpp:776 +#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783 msgid "Specifies output sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Уподоб. пристрій:" -#: gui/options.cpp:775 +#: gui/options.cpp:782 msgctxt "lowres" msgid "Music Device:" msgstr "Музичний пристрій:" -#: gui/options.cpp:802 +#: gui/options.cpp:809 msgid "AdLib emulator:" msgstr "Емулятор AdLib:" -#: gui/options.cpp:802 gui/options.cpp:803 +#: gui/options.cpp:809 gui/options.cpp:810 msgid "AdLib is used for music in many games" msgstr "Звукова карта AdLib використовується багатьма іграми" -#: gui/options.cpp:813 +#: gui/options.cpp:820 msgid "Output rate:" msgstr "Вихідна частота:" -#: gui/options.cpp:813 gui/options.cpp:814 +#: gui/options.cpp:820 gui/options.cpp:821 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -668,63 +669,63 @@ msgstr "" "Великі значення задають кращу якість звуку, проте вони можуть не " "підтримуватися вашою звуковою картою" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "GM Device:" msgstr "Пристрій GM:" -#: gui/options.cpp:824 +#: gui/options.cpp:831 msgid "Specifies default sound device for General MIDI output" msgstr "Вказує вихідний звуковий пристрій для General MIDI" -#: gui/options.cpp:835 +#: gui/options.cpp:842 msgid "Don't use General MIDI music" msgstr "Не використовувати музику General MIDI" -#: gui/options.cpp:846 gui/options.cpp:908 +#: gui/options.cpp:853 gui/options.cpp:915 msgid "Use first available device" msgstr "Використовувати перший наявний пристрій" -#: gui/options.cpp:858 +#: gui/options.cpp:865 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:858 gui/options.cpp:860 gui/options.cpp:861 +#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" "SoundFont підтримується деякими звуковими картами, Fluidsynth та Timidity" -#: gui/options.cpp:860 +#: gui/options.cpp:867 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Mixed AdLib/MIDI mode" msgstr "Змішаний режим AdLib/MIDI" -#: gui/options.cpp:866 +#: gui/options.cpp:873 msgid "Use both MIDI and AdLib sound generation" msgstr "Використовувати і MIDI і AdLib для генерації звуку" -#: gui/options.cpp:869 +#: gui/options.cpp:876 msgid "MIDI gain:" msgstr "Посилення MIDI:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "MT-32 Device:" msgstr "Пристрій MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:886 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Вказує звуковий пристрій за умовчанням для виводу на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:891 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:891 gui/options.cpp:893 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -732,193 +733,193 @@ msgstr "" "Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви " "хочете його використовувати" -#: gui/options.cpp:886 +#: gui/options.cpp:893 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Enable Roland GS Mode" msgstr "Увімкнути режим Roland GS" -#: gui/options.cpp:889 +#: gui/options.cpp:896 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" "Вимикає мапінг General MIDI для ігор зі звуковою доріжкою для Roland MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:905 msgid "Don't use Roland MT-32 music" msgstr "Не використовувати Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:932 msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:936 gui/options.cpp:946 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:937 gui/options.cpp:947 msgid "Subtitles" msgstr "Субтитри" -#: gui/options.cpp:931 +#: gui/options.cpp:938 msgid "Both" msgstr "Все" -#: gui/options.cpp:933 +#: gui/options.cpp:940 msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:935 +#: gui/options.cpp:942 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:939 +#: gui/options.cpp:946 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:940 +#: gui/options.cpp:947 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgctxt "lowres" msgid "Both" msgstr "Все" -#: gui/options.cpp:941 +#: gui/options.cpp:948 msgid "Show subtitles and play speech" msgstr "Показувати субтитри і відтворювати мову" -#: gui/options.cpp:943 +#: gui/options.cpp:950 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:959 +#: gui/options.cpp:966 msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:961 +#: gui/options.cpp:968 msgctxt "lowres" msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:968 +#: gui/options.cpp:975 msgid "Mute All" msgstr "Вимкнути все" -#: gui/options.cpp:971 +#: gui/options.cpp:978 msgid "SFX volume:" msgstr "Гучність ефектів:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981 msgid "Special sound effects volume" msgstr "Гучність спеціальних звукових ефектів" -#: gui/options.cpp:973 +#: gui/options.cpp:980 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. ефектів:" -#: gui/options.cpp:981 +#: gui/options.cpp:988 msgid "Speech volume:" msgstr "Гучність озвучки:" -#: gui/options.cpp:983 +#: gui/options.cpp:990 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. озвучки:" -#: gui/options.cpp:1124 +#: gui/options.cpp:1156 msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1126 +#: gui/options.cpp:1158 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Вказує шлях до додаткових файлів даних, які використовуються усіма іграми " "або ScummVM" -#: gui/options.cpp:1141 +#: gui/options.cpp:1173 msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1143 +#: gui/options.cpp:1175 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1152 +#: gui/options.cpp:1184 msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1154 +#: gui/options.cpp:1186 msgctxt "lowres" msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1156 +#: gui/options.cpp:1188 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1160 +#: gui/options.cpp:1192 msgid "GUI Renderer:" msgstr "Растер. GUI:" -#: gui/options.cpp:1172 +#: gui/options.cpp:1204 msgid "Autosave:" msgstr "Автозбереження:" -#: gui/options.cpp:1174 +#: gui/options.cpp:1206 msgctxt "lowres" msgid "Autosave:" msgstr "Автозбереж.:" -#: gui/options.cpp:1182 +#: gui/options.cpp:1214 msgid "Keys" msgstr "Клавіші" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "GUI Language:" msgstr "Мова інтерф.:" -#: gui/options.cpp:1189 +#: gui/options.cpp:1221 msgid "Language of ScummVM GUI" msgstr "Мова графічного інтерфейсу ScummVM" -#: gui/options.cpp:1340 +#: gui/options.cpp:1372 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Ви повинні перезапустити ScummVM щоб застосувати зміни." -#: gui/options.cpp:1353 +#: gui/options.cpp:1385 msgid "Select directory for savegames" msgstr "Виберіть папку для збережень" -#: gui/options.cpp:1360 +#: gui/options.cpp:1392 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу." -#: gui/options.cpp:1369 +#: gui/options.cpp:1401 msgid "Select directory for GUI themes" msgstr "Виберіть папку для тем GUI" -#: gui/options.cpp:1379 +#: gui/options.cpp:1411 msgid "Select directory for extra files" msgstr "Виберіть папку з додатковими файлами" -#: gui/options.cpp:1390 +#: gui/options.cpp:1422 msgid "Select directory for plugins" msgstr "Виберіть папку зі втулками" -#: gui/options.cpp:1443 +#: gui/options.cpp:1475 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." @@ -1000,22 +1001,22 @@ msgstr "Очистити значення" msgid "Engine does not support debug level '%s'" msgstr "Движок не підтримує рівень відладки '%s'" -#: base/main.cpp:277 +#: base/main.cpp:275 msgid "Menu" msgstr "Меню" -#: base/main.cpp:280 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Пропустити" -#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Пауза" -#: base/main.cpp:286 +#: base/main.cpp:284 msgid "Skip line" msgstr "Пропустити рядок" @@ -1091,25 +1092,6 @@ msgstr "Відмінено користувачем" msgid "Unknown error" msgstr "Невідома помилка" -#. I18N: Hercules is graphics card name -#: common/util.cpp:276 -msgid "Hercules Green" -msgstr "Hercules Зелений" - -#: common/util.cpp:277 -msgid "Hercules Amber" -msgstr "Hercules Бурштинний" - -#: common/util.cpp:284 -msgctxt "lowres" -msgid "Hercules Green" -msgstr "Hercules Зелений" - -#: common/util.cpp:285 -msgctxt "lowres" -msgid "Hercules Amber" -msgstr "Hercules Бурштинний" - #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." @@ -1181,17 +1163,27 @@ msgstr "" "README для основної інормації, а також інструкцій, як отримати подальшу " "допомогу." -#: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:243 +#, fuzzy, c-format +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Вибачте, цей движок не підтримує довідку по іграм. Будь-ласка, дивіться файл " +"README для основної інормації, а також інструкцій, як отримати подальшу " +"допомогу." + +#: engines/dialogs.cpp:321 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:317 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:322 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "Ві~д~міна" -#: engines/dialogs.cpp:320 +#: engines/dialogs.cpp:325 msgid "~K~eys" msgstr "~К~лавіші" @@ -1239,7 +1231,17 @@ msgstr "" "того, щоб можна було слухати музику у грі.\n" "Дивіться файл README для подальших інструкцій." -#: engines/engine.cpp:435 +#: engines/engine.cpp:426 +#, fuzzy, c-format +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Вибачте, цей движок не підтримує довідку по іграм. Будь-ласка, дивіться файл " +"README для основної інормації, а також інструкцій, як отримати подальшу " +"допомогу." + +#: engines/engine.cpp:439 msgid "" "WARNING: The game you are about to start is not yet fully supported by " "ScummVM. As such, it is likely to be unstable, and any saves you make might " @@ -1249,7 +1251,7 @@ msgstr "" "ScummVM. Скорше за все вона не буде працювати стабільно, і збереження ігор, " "які ви зробите, можуть не працювати у подальших версіях ScummVM." -#: engines/engine.cpp:438 +#: engines/engine.cpp:442 msgid "Start anyway" msgstr "Все одно запустити" @@ -1293,7 +1295,7 @@ 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:244 +#: backends/events/default/default-events.cpp:213 msgid "Quit" msgstr "Вихід" @@ -1992,11 +1994,11 @@ msgid "Cutscene file '%s' not found!" msgstr "Файл заставки '%s' не знайдено!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 -#: engines/tinsel/saveload.cpp:500 +#: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Не вдалося завантажити стан гри з файлу." -#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:513 +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Не вдалося зберегти стан гри у файл." @@ -2086,15 +2088,20 @@ msgstr "" "Файл sky.cpt має невірний розмір.\n" "Будь ласка, (пере)завантажте його з www.scummvm.org" -#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379 +#: engines/sword1/animation.cpp:539 +#, c-format +msgid "PSX stream cutscene '%s' cannot be played in paletted mode" +msgstr "" + +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "Знайдено заставки DXA, але ScummVM був побудований без підтримки zlib" -#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "Заставки MPEG2 більше не підтримуються" -#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Заставку '%s' не знайдено" @@ -2137,6 +2144,12 @@ msgstr "Взяти нове" msgid "This is the end of the Broken Sword 1 Demo" msgstr "На цьому закінчується демо Broken Sword 1" +#: engines/sword2/animation.cpp:435 +#, fuzzy +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "Знайдено заставки DXA, але ScummVM був побудований без підтримки zlib" + #: engines/parallaction/saveload.cpp:133 #, c-format msgid "" @@ -2194,7 +2207,7 @@ msgstr "Емулятор MAME OPL:" msgid "DOSBox OPL emulator" msgstr "Емулятор DOSBox OPL" -#: audio/mididrv.cpp:208 +#: audio/mididrv.cpp:209 #, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " @@ -2203,12 +2216,12 @@ msgstr "" "Вибраний звуковий пристрій %s не було знайдено (тобто, його може бути " "вимкнено або не підключено)." -#: audio/mididrv.cpp:208 audio/mididrv.cpp:220 audio/mididrv.cpp:256 -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Намагаюся використати наступний доступний пристрій..." -#: audio/mididrv.cpp:220 +#: audio/mididrv.cpp:221 #, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " @@ -2217,7 +2230,7 @@ msgstr "" "Вибраний звуковий пристрій %s не може бути використаний. Дивіться файл логу " "для додаткової інформації." -#: audio/mididrv.cpp:256 +#: audio/mididrv.cpp:257 #, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " @@ -2226,7 +2239,7 @@ msgstr "" "Уподобаний звуковий пристрій %s не було знайдено (тобто, його може бути " "вимкнено або не підключено)." -#: audio/mididrv.cpp:271 +#: audio/mididrv.cpp:272 #, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " @@ -2283,11 +2296,15 @@ msgstr " (Ефективна)" msgid " (Active)" msgstr " (Активна)" -#: backends/keymapper/remap-dialog.cpp:116 +#: backends/keymapper/remap-dialog.cpp:106 +msgid " (Blocked)" +msgstr "" + +#: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" msgstr " (Глобальна)" -#: backends/keymapper/remap-dialog.cpp:126 +#: backends/keymapper/remap-dialog.cpp:127 msgid " (Game)" msgstr " (Ігри)" @@ -2367,27 +2384,27 @@ msgstr "Висока якість звуку (повільніше) (ребут)" msgid "Disable power off" msgstr "Заборонити вимкнення" -#: backends/platform/iphone/osys_events.cpp:338 +#: backends/platform/iphone/osys_events.cpp:301 msgid "Mouse-click-and-drag mode enabled." msgstr "Режим миші клікнути-та-тягнути увімкнено." -#: backends/platform/iphone/osys_events.cpp:340 +#: backends/platform/iphone/osys_events.cpp:303 msgid "Mouse-click-and-drag mode disabled." msgstr "Режим миші клікнути-та-тягнути вимкнено." -#: backends/platform/iphone/osys_events.cpp:351 +#: backends/platform/iphone/osys_events.cpp:314 msgid "Touchpad mode enabled." msgstr "Режим тачпаду увімкнено." -#: backends/platform/iphone/osys_events.cpp:353 +#: backends/platform/iphone/osys_events.cpp:316 msgid "Touchpad mode disabled." msgstr "Режим тачпаду вимкнено." -#: backends/platform/maemo/maemo.cpp:178 +#: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" msgstr "Режим кліків" -#: backends/platform/maemo/maemo.cpp:184 +#: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 #: backends/platform/wince/CEActionsPocket.cpp:60 #: backends/platform/wince/CEActionsSmartphone.cpp:43 @@ -2395,11 +2412,11 @@ msgstr "Режим кліків" msgid "Left Click" msgstr "Лівий клік" -#: backends/platform/maemo/maemo.cpp:187 +#: backends/platform/maemo/maemo.cpp:214 msgid "Middle Click" msgstr "Середній клік" -#: backends/platform/maemo/maemo.cpp:190 +#: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 #: backends/platform/wince/CEActionsSmartphone.cpp:44 #: backends/platform/bada/form.cpp:273 @@ -2791,15 +2808,15 @@ msgstr "" "Не забудьте перепризначити кнопку для дії 'Сховати Панель інстр.' щоб " "побачити весь інвентар" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" msgstr "Ви дійсно хочете повернутися до головного меню?" -#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:191 msgid "Launcher" msgstr "Головне меню" -#: backends/events/default/default-events.cpp:244 +#: backends/events/default/default-events.cpp:213 msgid "Do you really want to quit?" msgstr "Ви дійсно хочете вийти?" @@ -2873,6 +2890,20 @@ msgstr "Кліки увімкнено" msgid "Clicking Disabled" msgstr "Кліки вимкнено" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Зелений" + +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Бурштинний" + +#~ msgctxt "lowres" +#~ msgid "Hercules Green" +#~ msgstr "Hercules Зелений" + +#~ msgctxt "lowres" +#~ msgid "Hercules Amber" +#~ msgstr "Hercules Бурштинний" + #~ msgid "Save game failed!" #~ msgstr "Не вдалося зберегти гру!" diff --git a/test/common/memoryreadstream.h b/test/common/memoryreadstream.h index a476f12a2f..adef861a5e 100644 --- a/test/common/memoryreadstream.h +++ b/test/common/memoryreadstream.h @@ -84,4 +84,20 @@ class MemoryReadStreamTestSuite : public CxxTest::TestSuite { TS_ASSERT_EQUALS(ms.pos(), 7); TS_ASSERT(!ms.eos()); } + + void test_eos() { + byte contents[] = { 1, 2, 3, 4, 5, 6, 7 }; + Common::MemoryReadStream ms(contents, sizeof(contents)); + + // Read after the end of the stream + for (int32 i = 0; i <= ms.size(); ++i) + ms.readByte(); + + // The eos flag should be set here + TS_ASSERT(ms.eos()); + + // Seeking should reset the eos flag + ms.seek(0, SEEK_SET); + TS_ASSERT(!ms.eos()); + } }; diff --git a/test/common/subreadstream.h b/test/common/subreadstream.h index 463f49e929..32e6f938d2 100644 --- a/test/common/subreadstream.h +++ b/test/common/subreadstream.h @@ -26,4 +26,22 @@ class SubReadStreamTestSuite : public CxxTest::TestSuite { b = srs.readByte(); TS_ASSERT(srs.eos()); } + + void test_safe_eos() { + byte contents[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + Common::MemoryReadStream ms(contents, sizeof(contents)); + + Common::SafeSeekableSubReadStream ssrs1(&ms, 0, sizeof(contents)); + Common::SafeSeekableSubReadStream ssrs2(&ms, 0, sizeof(contents)); + + // Read after the end of the stream of the first sub stream + for (int32 i = 0; i <= ssrs1.size(); ++i) + ssrs1.readByte(); + + // eos should be set for the first sub stream + TS_ASSERT(ssrs1.eos()); + + // eos should not be set for the second sub stream + TS_ASSERT(!ssrs2.eos()); + } }; |