diff options
58 files changed, 980 insertions, 861 deletions
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index 8669bf6a66..7e6ef9588e 100644 --- a/backends/platform/sdl/macosx/macosx.cpp +++ b/backends/platform/sdl/macosx/macosx.cpp @@ -137,7 +137,7 @@ bool OSystem_MacOSX::openUrl(const Common::String &url) { CFURLRef urlRef = CFURLCreateWithBytes (NULL, (UInt8*)url.c_str(), url.size(), kCFStringEncodingASCII, NULL); OSStatus err = LSOpenCFURLRef(urlRef, NULL); CFRelease(urlRef); - return err != noErr; + return err == noErr; } Common::String OSystem_MacOSX::getSystemLanguage() const { diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 0867a101b0..14c0cb0c18 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -85,11 +85,11 @@ MainMenuDialog::MainMenuDialog(Engine *engine) new GUI::ButtonWidget(this, "GlobalMenu.Resume", _("~R~esume"), 0, kPlayCmd, 'P'); _loadButton = new GUI::ButtonWidget(this, "GlobalMenu.Load", _("~L~oad"), 0, kLoadCmd); - // TODO: setEnabled -> setVisible + _loadButton->setVisible(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime)); _loadButton->setEnabled(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime)); _saveButton = new GUI::ButtonWidget(this, "GlobalMenu.Save", _("~S~ave"), 0, kSaveCmd); - // TODO: setEnabled -> setVisible + _saveButton->setVisible(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime)); _saveButton->setEnabled(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime)); new GUI::ButtonWidget(this, "GlobalMenu.Options", _("~O~ptions"), 0, kOptionsCmd); diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 8a7cc78784..efa10c337c 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -35,9 +35,6 @@ namespace Sci { Kernel::Kernel(ResourceManager *resMan, SegManager *segMan) : _resMan(resMan), _segMan(segMan), _invalid("<invalid>") { -#ifdef ENABLE_SCI32 - _kernelFunc_StringId = 0; -#endif } Kernel::~Kernel() { @@ -615,10 +612,6 @@ void Kernel::mapFunctions() { } #ifdef ENABLE_SCI32 - if (kernelName == "String") { - _kernelFunc_StringId = id; - } - // HACK: Phantasmagoria Mac uses a modified kDoSound (which *nothing* // else seems to use)! if (g_sci->getPlatform() == Common::kPlatformMacintosh && g_sci->getGameId() == GID_PHANTASMAGORIA && kernelName == "DoSound") { diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index dd75f26320..bddfab531f 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -183,12 +183,6 @@ public: typedef Common::Array<KernelFunction> KernelFunctionArray; KernelFunctionArray _kernelFuncs; /**< Table of kernel functions. */ -#ifdef ENABLE_SCI32 - // id of kString function, for quick usage in kArray - // kArray calls kString in case parameters are strings - uint16 _kernelFunc_StringId; -#endif - /** * Determines whether a list of registers matches a given signature. * If no signature is given (i.e., if sig is NULL), this is always diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index fd6fab6506..6c96607664 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -325,7 +325,7 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) { return SIGNAL_REG; } else if (mode == _K_FILE_MODE_OPEN_OR_FAIL) { // Create a virtual file containing the save game description - // and slot number, as the game scripts expect. + // and current score progress, as the game scripts expect. int saveNo; sscanf(name.c_str(), "%d.SG", &saveNo); saveNo += kSaveIdShift; @@ -365,7 +365,7 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) { return SIGNAL_REG; } else if (mode == _K_FILE_MODE_OPEN_OR_FAIL) { // Create a virtual file containing the save game description - // and slot number, as the game scripts expect. + // and avatar ID, as the game scripts expect. int saveNo; sscanf(name.c_str(), "%d.DTA", &saveNo); saveNo += kSaveIdShift; diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 31b9f779ea..7650d2f215 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -656,7 +656,7 @@ reg_t kPlatform32(EngineState *s, int argc, reg_t *argv) { reg_t kWebConnect(EngineState *s, int argc, reg_t *argv) { const Common::String baseUrl = "https://web.archive.org/web/1996/"; const Common::String gameUrl = argc > 0 ? s->_segMan->getString(argv[0]) : "http://www.sierra.com"; - return make_reg(0, !g_system->openUrl(baseUrl + gameUrl)); + return make_reg(0, g_system->openUrl(baseUrl + gameUrl)); } reg_t kWinExec(EngineState *s, int argc, reg_t *argv) { diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp index b0e9939348..5d85bf6b8d 100644 --- a/engines/sci/engine/object.cpp +++ b/engines/sci/engine/object.cpp @@ -106,7 +106,8 @@ void Object::init(const Script &owner, reg_t obj_pos, bool initVariables) { const uint32 nameOffset = _propertyOffsetsSci3[0]; const uint32 relocOffset = owner.getRelocationOffset(nameOffset); if (relocOffset != kNoRelocation) { - _name = make_reg(obj_pos.getSegment(), relocOffset + buf.getUint16SEAt(nameOffset)); + _name.setSegment(obj_pos.getSegment()); + _name.setOffset(relocOffset + buf.getUint16SEAt(nameOffset)); } #endif } diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp index 1a276b1dd6..6d8938c7a4 100644 --- a/engines/sci/engine/script_patches.cpp +++ b/engines/sci/engine/script_patches.cpp @@ -76,6 +76,7 @@ namespace Sci { // before they can get used using the SIG_SELECTORx and PATCH_SELECTORx commands. // You have to use the exact same order in both the table and the enum, otherwise // it won't work. +// ATTENTION: selectors will only work here, when they are also in SelectorCache (selector.h) static const char *const selectorNameTable[] = { "cycles", // system selector @@ -91,6 +92,7 @@ static const char *const selectorNameTable[] = { "cel", // system selector "setMotion", // system selector "overlay", // system selector + "setPri", // system selector - for setting priority "deskSarg", // Gabriel Knight "localize", // Freddy Pharkas "put", // Police Quest 1 VGA @@ -128,6 +130,7 @@ enum ScriptPatcherSelectors { SELECTOR_cel, SELECTOR_setMotion, SELECTOR_overlay, + SELECTOR_setPri, SELECTOR_deskSarg, SELECTOR_localize, SELECTOR_put, @@ -2133,9 +2136,34 @@ static const uint16 kq7BenchmarkPatch[] = { PATCH_END }; +// When attempting to use an inventory item on an object that does not interact +// with that item, the game temporarily displays an X cursor, but does this by +// spinning for 90000 cycles, which make the duration dependent on CPU speed, +// maxes out the CPU for no reason, and keeps the engine from polling for events +// (which may make the window appear nonresponsive to the OS) +// Applies to at least: KQ7 English 2.00b +static const uint16 kq7PragmaFailSpinSignature[] = { + 0x35, 0x00, // ldi 0 + 0xa5, 0x02, // sat 2 + SIG_MAGICDWORD, + 0x8d, 0x02, // lst 2 + 0x35, 0x03, // ldi 3 + 0x22, // lt? + SIG_END +}; + +static const uint16 kq7PragmaFailSpinPatch[] = { + 0x78, // push1 + 0x39, 0x12, // pushi 18 (~300ms) + 0x43, kScummVMWaitId, PATCH_UINT16(0x02), // callk Wait, 2 + 0x33, 0x16, // jmp to setCursor + PATCH_END +}; + // script, description, signature patch static const SciScriptPatcherEntry kq7Signatures[] = { { true, 0, "disable video benchmarking", 1, kq7BenchmarkSignature, kq7BenchmarkPatch }, + { true, 0, "remove hardcoded spinloop", 1, kq7PragmaFailSpinSignature, kq7PragmaFailSpinPatch }, { true, 31, "subtitle fix 1/3", 1, kq7SignatureSubtitleFix1, kq7PatchSubtitleFix1 }, { true, 64928, "subtitle fix 2/3", 1, kq7SignatureSubtitleFix2, kq7PatchSubtitleFix2 }, { true, 64928, "subtitle fix 3/3", 1, kq7SignatureSubtitleFix3, kq7PatchSubtitleFix3 }, @@ -2498,6 +2526,79 @@ static const SciScriptPatcherEntry larry6HiresSignatures[] = { SCI_SIGNATUREENTRY_TERMINATOR }; +#pragma mark - +#pragma mark Leisure Suit Larry 7 + +// =========================================================================== +// In room 540 of Leisure Suit Larry 7, Larry will use 4 items on a so called cheese maker. +// A short cutscene will then play. +// During that cutscene on state 6, an animation will get triggered via a special +// cycler ("End", but from script 64041), that is capable of doing ::cues on specific cels. +// The code of the state is broken and pushes the object itself as the 2nd cel to cue on. +// This parameter gets later changed to last cel by CycleCueList::init. +// Right now, we do not handle comparisons between references to objects and regular values like +// SSCI, so this will need to get fixed too. But this script bug should also get fixed, because +// otherwise it works just by accident. +// +// Applies to at least: English PC-CD, German PC-CD +// Responsible method: soMakeCheese::changeState(6) in script 540 +static const uint16 larry7SignatureMakeCheese[] = { + 0x38, SIG_UINT16(4), // pushi 04 + 0x51, 0xc4, // class End + 0x36, // push + SIG_MAGICDWORD, + 0x7c, // pushSelf + 0x39, 0x04, // pushi 04 + 0x7c, // pushSelf + SIG_END +}; + +static const uint16 larry7PatchMakeCheese[] = { + 0x39, 0x04, // pushi 04 - save 1 byte + 0x51, 0xc4, // class End + 0x36, + 0x7c, // pushSelf + 0x39, 0x04, // pushi 04 + 0x39, 0x10, // pushi 10h (last cel of view 54007, loop 0) + PATCH_END +}; + +// =========================================================================== +// During the same cheese maker cutscene as mentioned before, there is also +// a little priority issue, which also happens in the original interpreter. +// While Larry is pouring liquid into the cheese maker, he appears shortly right +// in front of the guillotine instead of behind it. +// This is caused by soMakeCheese::changeState(2) setting priority of ego to 500. +// It is needed to change priority a bit, otherwise Larry would also appear behind the cheese +// maker and that wouldn't make sense, but the cheese maker has a priority of only 373. +// +// This of course also happens, when using the original interpreter. +// +// We change this to set priority to 374, which works fine. +// +// Applies to at least: English PC-CD, German PC-CD +// Responsible method: soMakeCheese::changeState(2) in script 540 +static const uint16 larry7SignatureMakeCheesePriority[] = { + 0x38, SIG_SELECTOR16(setPri), // pushi (setPri) + SIG_MAGICDWORD, + 0x78, // push1 + 0x38, SIG_UINT16(500), // pushi 1F4h (500d) + SIG_END +}; + +static const uint16 larry7PatchMakeCheesePriority[] = { + PATCH_ADDTOOFFSET(+4), + 0x38, PATCH_UINT16(374), // pushi 176h (374d) + PATCH_END +}; + +// script, description, signature patch +static const SciScriptPatcherEntry larry7Signatures[] = { + { true, 540, "fix make cheese cutscene (cycler)", 1, larry7SignatureMakeCheese, larry7PatchMakeCheese }, + { true, 540, "fix make cheese cutscene (priority)", 1, larry7SignatureMakeCheesePriority, larry7PatchMakeCheesePriority }, + SCI_SIGNATUREENTRY_TERMINATOR +}; + #endif // =========================================================================== @@ -3323,9 +3424,9 @@ static const uint16 mothergooseHiresPatchLogo[] = { // Responsible method: rhymeScript::changeState static const uint16 mothergooseHiresSignatureHorse[] = { SIG_MAGICDWORD, - 0x39, 0x4a, // pushi $4a (setPri) - 0x78, // push1 - 0x38, SIG_UINT16(0xb7), // pushi $b7 + 0x39, SIG_SELECTOR8(setPri), // pushi $4a (setPri) + 0x78, // push1 + 0x38, SIG_UINT16(0xb7), // pushi $b7 SIG_END }; @@ -5962,6 +6063,9 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) { case GID_LSL6HIRES: signatureTable = larry6HiresSignatures; break; + case GID_LSL7: + signatureTable = larry7Signatures; + break; #endif case GID_MOTHERGOOSE256: signatureTable = mothergoose256Signatures; diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h index 344977c391..adc8f138be 100644 --- a/engines/sci/engine/segment.h +++ b/engines/sci/engine/segment.h @@ -740,7 +740,7 @@ public: case kArrayTypeID: { reg_t *target = (reg_t *)_data + index; while (count--) { - *target = value; + *target++ = value; } break; } @@ -749,7 +749,7 @@ public: byte *target = (byte *)_data + index; const byte fillValue = value.getOffset(); while (count--) { - *target = fillValue; + *target++ = fillValue; } break; } diff --git a/engines/sci/engine/selector.h b/engines/sci/engine/selector.h index c6ecd9dd26..1db9e4bec4 100644 --- a/engines/sci/engine/selector.h +++ b/engines/sci/engine/selector.h @@ -88,6 +88,7 @@ struct SelectorCache { // value, save, restore, title, button, icon, draw Selector delete_; ///< Called by Animate() to dispose a view object Selector z; + Selector setPri; // SCI1+ static selectors Selector parseLang; diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index 8aa1697f07..08c6f5d75a 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -151,6 +151,13 @@ static const ClassReference classReferences[] = { { 999, "Script", "init", kSelectorMethod, 0 }, { 999, "Script", "dispose", kSelectorMethod, 2 }, { 999, "Script", "changeState", kSelectorMethod, 3 } +#ifdef ENABLE_SCI32 + , + { 64929, "Sync", "syncTime", kSelectorVariable, 2 }, + { 64929, "Sync", "syncCue", kSelectorVariable, 3 }, + { 64999, "Obj", "init", kSelectorMethod, 1 }, + { 64999, "Obj", "doit", kSelectorMethod, 2 } +#endif }; Common::StringArray Kernel::checkStaticSelectorNames() { @@ -222,27 +229,35 @@ void Kernel::findSpecificSelectors(Common::StringArray &selectorNames) { // We need to initialize script 0 here, to make sure that it's always // located at segment 1. _segMan->instantiateScript(0); - uint16 sci2Offset = (getSciVersion() >= SCI_VERSION_2) ? 64000 : 0; // The Actor class contains the init, xLast and yLast selectors, which // we reference directly. It's always in script 998, so we need to // explicitly load it here. - if ((getSciVersion() >= SCI_VERSION_1_EGA_ONLY)) { + if (getSciVersion() >= SCI_VERSION_1_EGA_ONLY) { uint16 actorScript = 998; +#ifdef ENABLE_SCI32 + if (getSciVersion() >= SCI_VERSION_2) { + actorScript += 64000; + } +#endif - if (_resMan->testResource(ResourceId(kResourceTypeScript, actorScript + sci2Offset))) { - _segMan->instantiateScript(actorScript + sci2Offset); + if (_resMan->testResource(ResourceId(kResourceTypeScript, actorScript))) { + _segMan->instantiateScript(actorScript); const Object *actorClass = _segMan->getObject(_segMan->findObjectByName("Actor")); if (actorClass) { // Find the xLast and yLast selectors, used in kDoBresen - const int offset = (getSciVersion() < SCI_VERSION_1_1) ? 3 : 0; - const int offset2 = (getSciVersion() >= SCI_VERSION_2) ? 12 : 0; + int offset = (getSciVersion() < SCI_VERSION_1_1) ? 3 : 0; +#ifdef ENABLE_SCI32 + if (getSciVersion() >= SCI_VERSION_2) { + offset += 12; + } +#endif // xLast and yLast always come between illegalBits and xStep - int illegalBitsSelectorPos = actorClass->locateVarSelector(_segMan, 15 + offset + offset2); // illegalBits - int xStepSelectorPos = actorClass->locateVarSelector(_segMan, 51 + offset + offset2); // xStep + int illegalBitsSelectorPos = actorClass->locateVarSelector(_segMan, 15 + offset); // illegalBits + int xStepSelectorPos = actorClass->locateVarSelector(_segMan, 51 + offset); // xStep if (xStepSelectorPos - illegalBitsSelectorPos != 3) { error("illegalBits and xStep selectors aren't found in " "known locations. illegalBits = %d, xStep = %d", @@ -257,19 +272,19 @@ void Kernel::findSpecificSelectors(Common::StringArray &selectorNames) { selectorNames[xLastSelectorPos] = "xLast"; selectorNames[yLastSelectorPos] = "yLast"; - } // if (actorClass) + } - _segMan->uninstantiateScript(998); - } // if (_resMan->testResource(ResourceId(kResourceTypeScript, 998))) - } // if ((getSciVersion() >= SCI_VERSION_1_EGA_ONLY)) + _segMan->uninstantiateScript(actorScript); + } + } // Find selectors from specific classes for (int i = 0; i < ARRAYSIZE(classReferences); i++) { - if (!_resMan->testResource(ResourceId(kResourceTypeScript, classReferences[i].script + sci2Offset))) + if (!_resMan->testResource(ResourceId(kResourceTypeScript, classReferences[i].script))) continue; - _segMan->instantiateScript(classReferences[i].script + sci2Offset); + _segMan->instantiateScript(classReferences[i].script); const Object *targetClass = _segMan->getObject(_segMan->findObjectByName(classReferences[i].className)); int targetSelectorPos = 0; @@ -303,7 +318,6 @@ void Kernel::findSpecificSelectors(Common::StringArray &selectorNames) { } } - // Reset the segment manager _segMan->resetSegMan(); } diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h index 598a062f21..d51913473c 100644 --- a/engines/sci/graphics/celobj32.h +++ b/engines/sci/graphics/celobj32.h @@ -134,6 +134,8 @@ struct CelInfo32 { return Common::String::format("color %d", color); case kCelTypeMem: return Common::String::format("mem %04x:%04x", PRINT_REG(bitmap)); + default: + assert(!"Should never happen"); } } }; diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp index c29e547b83..2a8600969e 100644 --- a/engines/sci/graphics/cursor.cpp +++ b/engines/sci/graphics/cursor.cpp @@ -199,18 +199,6 @@ void GfxCursor::kernelSetView(GuiResourceId viewNum, int loopNum, int celNum, Co if (_useOriginalKQ6WinCursors) viewNum += 2000; // Windows cursors - if (g_sci->getGameId() == GID_PHANTASMAGORIA2) { - // HACK: Ignore cursor views for Phantasmagoria 2. They've got - // differences from other SCI32 views, thus we skip them for - // now, otherwise our view decoding code will crash. - // The view code will crash with *any* view in P2, but this hack - // allows the game to start and show the menu. - // TODO: Remove once the view code is updated to handle - // Phantasmagoria 2 views. - warning("TODO: Cursor views for Phantasmagoria 2"); - return; - } - // Use the alternate silver cursors in SQ4 CD, if requested if (_useSilverSQ4CDCursors) { switch(viewNum) { diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp index a8724dee67..0a69ab2a98 100644 --- a/engines/sci/graphics/plane32.cpp +++ b/engines/sci/graphics/plane32.cpp @@ -149,8 +149,7 @@ void Plane::convertGameRectToPlaneRect() { } void Plane::printDebugInfo(Console *con) const { - Common::String name; - + const char *name; if (_object.isNumber()) { name = "-scummvm-"; } else { @@ -159,7 +158,7 @@ void Plane::printDebugInfo(Console *con) const { con->debugPrintf("%04x:%04x (%s): type %d, prio %d, ins %u, pic %d, mirror %d, back %d\n", PRINT_REG(_object), - name.c_str(), + name, _type, _priority, _creationId, diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp index d184485aa6..7b7553189a 100644 --- a/engines/sci/graphics/screen_item32.cpp +++ b/engines/sci/graphics/screen_item32.cpp @@ -499,9 +499,16 @@ CelObj &ScreenItem::getCelObj() const { } void ScreenItem::printDebugInfo(Console *con) const { + const char *name; + if (_object.isNumber()) { + name = "-scummvm-"; + } else { + name = g_sci->getEngineState()->_segMan->getObjectName(_object); + } + con->debugPrintf("%04x:%04x (%s), prio %d, ins %u, x %d, y %d, z: %d, scaledX: %d, scaledY: %d flags: %d\n", - _object.getSegment(), _object.getOffset(), - g_sci->getEngineState()->_segMan->getObjectName(_object), + PRINT_REG(_object), + name, _priority, _creationId, _position.x, diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 7dab65a041..59f1b35879 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -151,6 +151,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam SearchMan.addSubDirectoryMatching(gameDataDir, "robots"); // robot movie files SearchMan.addSubDirectoryMatching(gameDataDir, "movie"); // VMD movie files SearchMan.addSubDirectoryMatching(gameDataDir, "movies"); // VMD movie files + SearchMan.addSubDirectoryMatching(gameDataDir, "music"); // LSL7 music files (GOG version) SearchMan.addSubDirectoryMatching(gameDataDir, "music/22s16"); // LSL7 music files SearchMan.addSubDirectoryMatching(gameDataDir, "vmd"); // VMD movie files SearchMan.addSubDirectoryMatching(gameDataDir, "duk"); // Duck movie files in Phantasmagoria 2 diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 1228d73ae8..2e53070a8c 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -441,6 +441,8 @@ MODULE_OBJS := \ star_control/frange.o \ star_control/frect.o \ star_control/fvector.o \ + star_control/matrix_transform.o \ + star_control/orientation_changer.o \ star_control/star_camera.o \ star_control/star_closeup.o \ star_control/star_control_sub2.o \ @@ -450,8 +452,6 @@ MODULE_OBJS := \ star_control/star_control_sub22.o \ star_control/star_control_sub23.o \ star_control/star_control_sub24.o \ - star_control/star_control_sub25.o \ - star_control/star_control_sub26.o \ star_control/star_control_sub27.o \ star_control/star_field.o \ star_control/star_points1.o \ diff --git a/engines/titanic/star_control/dmatrix.cpp b/engines/titanic/star_control/dmatrix.cpp index b7ebbc718a..079ce2f975 100644 --- a/engines/titanic/star_control/dmatrix.cpp +++ b/engines/titanic/star_control/dmatrix.cpp @@ -22,7 +22,7 @@ #include "titanic/star_control/dmatrix.h" #include "titanic/star_control/fmatrix.h" -#include "titanic/star_control/star_control_sub26.h" +#include "titanic/star_control/matrix_transform.h" namespace Titanic { @@ -174,43 +174,31 @@ DMatrix DMatrix::fn1() const { return m; } -void DMatrix::fn3(CStarControlSub26 *sub26) { - double v3, v4, v5, v6, v7, v8, v9, v10; - double v11, v12, v13, v14, v15, v16, v17, v18, v19, v20; - - v3 = sub26->fn1(); - if (v3 <= 0.0) - v20 = 0.0; - else - v20 = 2.0 / v3; - v4 = v20 * sub26->_sub._v1; - v5 = v20 * sub26->_sub._v2; - v6 = v20 * sub26->_sub._v3; - v7 = v4 * sub26->_sub._v1; - v8 = v4; - v9 = v5; - v10 = v5 * sub26->_sub._v1; - v11 = v5 * sub26->_sub._v2; - v12 = v6; - v13 = v8 * sub26->_field0; - v14 = v12 + v11; - v15 = v6 * sub26->_sub._v2; - v16 = v6 * sub26->_field0; - v17 = v11 + v7; - v18 = v6 * sub26->_sub._v1; - v19 = v9 * sub26->_field0; - _row1._x = 1.0 - v14; - _row1._y = v10 + v16; - _row1._z = v18 - v19; - _row2._x = v10 - v16; - _row2._y = 1.0 - (v12 + v7); - _row2._z = v15 + v13; - _row3._x = v18 + v19; - _row3._y = v15 - v13; - _row3._z = 1.0 - v17; - _row4._x = 0.0; - _row4._y = 0.0; - _row4._z = 0.0; +void DMatrix::loadTransform(const CMatrixTransform &src) { + double total = src.fn1(); + double factor = (total <= 0.0) ? 0.0 : 2.0 / total; + DVector temp1V = src._vector * factor; + DVector temp2V = temp1V * src._vector; + + double val1 = temp1V._y * src._vector._x; + double val2 = temp1V._z * src._vector._x; + double val3 = temp1V._z * src._vector._y; + double val4 = temp1V._x * src._field0; + double val5 = temp1V._y * src._field0; + double val6 = temp1V._z * src._field0; + + _row1._x = 1.0 - (temp2V._z + temp2V._y); + _row1._y = val1 + val6; + _row1._z = val2 - val5; + _row2._x = val1 - val6; + _row2._y = 1.0 - (temp2V._z + temp2V._x); + _row2._z = val3 + val4; + _row3._x = val2 + val5; + _row3._y = val3 - val4; + _row3._z = 1.0 - (temp2V._y + temp2V._x); + _row4._x = 0; + _row4._y = 0; + _row4._z = 0; } DMatrix DMatrix::fn4(const DMatrix &m) { diff --git a/engines/titanic/star_control/dmatrix.h b/engines/titanic/star_control/dmatrix.h index cc14c5ebbf..1cc36167df 100644 --- a/engines/titanic/star_control/dmatrix.h +++ b/engines/titanic/star_control/dmatrix.h @@ -29,7 +29,7 @@ namespace Titanic { class FMatrix; -class CStarControlSub26; +class CMatrixTransform; /** * Double based matrix class. @@ -58,7 +58,8 @@ public: void setRotationMatrix(Axis axis, double amount); DMatrix fn1() const; - void fn3(CStarControlSub26 *sub26); + + void loadTransform(const CMatrixTransform &src); DMatrix fn4(const DMatrix &m); }; diff --git a/engines/titanic/star_control/dvector.h b/engines/titanic/star_control/dvector.h index d3638cfeac..d9672065bf 100644 --- a/engines/titanic/star_control/dvector.h +++ b/engines/titanic/star_control/dvector.h @@ -87,6 +87,14 @@ public: _y -= delta._y; _z -= delta._z; } + + const DVector operator*(double right) const { + return DVector(_x * right, _y * right, _z * right); + } + + const DVector operator*(const DVector &right) const { + return DVector(_x * right._x, _y * right._y, _z * right._z); + } }; } // End of namespace Titanic diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp index ff07b9bd03..a107ad1ed2 100644 --- a/engines/titanic/star_control/fvector.cpp +++ b/engines/titanic/star_control/fvector.cpp @@ -58,12 +58,11 @@ float FVector::normalize() { return hyp; } -const FVector *FVector::addAndNormalize(FVector &dest, const FVector &v1, const FVector &v2) { - FVector tempVector(v1._x + v2._x, v1._y + v2._y, v1._z + v2._z); - tempVector.normalize(); +FVector FVector::addAndNormalize(const FVector &v) const { + FVector tempV(_x + v._x, _y + v._y, _z + v._z); + tempV.normalize(); - dest = tempVector; - return &dest; + return tempV; } float FVector::getDistance(const FVector &src) const { diff --git a/engines/titanic/star_control/fvector.h b/engines/titanic/star_control/fvector.h index a9cb44a19c..fa24fe58c1 100644 --- a/engines/titanic/star_control/fvector.h +++ b/engines/titanic/star_control/fvector.h @@ -64,9 +64,10 @@ public: float normalize(); /** - * Adds two vectors together and then normalizes the result + * Adds the current vector and a passed one together, normalizes them, + * and then returns the resulting vector */ - static const FVector *addAndNormalize(FVector &dest, const FVector &v1, const FVector &v2); + FVector addAndNormalize(const FVector &v) const; /** * Returns the distance between a specified point and this one diff --git a/engines/titanic/star_control/matrix_transform.cpp b/engines/titanic/star_control/matrix_transform.cpp new file mode 100644 index 0000000000..9de21e42aa --- /dev/null +++ b/engines/titanic/star_control/matrix_transform.cpp @@ -0,0 +1,146 @@ +/* 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 "titanic/star_control/matrix_transform.h" +#include "common/textconsole.h" + +namespace Titanic { + +void CMatrixTransform::setup(double val1, double x, double y, double z) { + _field0 = val1; + _vector._x = x; + _vector._y = y; + _vector._z = z; +} + +void CMatrixTransform::copyFrom(const CMatrixTransform &src) { + _field0 = src._field0; + _vector = src._vector; +} + +double CMatrixTransform::fn1() const { + return _vector._x * _vector._x + _vector._y * _vector._y + + _vector._z * _vector._z + _field0 * _field0; +} + +double CMatrixTransform::fn2(const CMatrixTransform &src) { + return _field0 * src._field0 + _vector._x * src._vector._x + + _vector._y * src._vector._y + _vector._z * src._vector._z; +} + +CMatrixTransform CMatrixTransform::resize(double factor) const { + CMatrixTransform dest; + dest.setup(_field0 * factor, _vector._x * factor, _vector._y * factor, + _vector._z * factor); + return dest; +} + +void CMatrixTransform::fn4(const DMatrix &m) { + double total = m._row1._x + m._row3._z + m._row2._y + 1.0; + + if (total <= 0.00001) { + total = m._row3._z; + + if (m._row1._x <= m._row3._z) { + if (m._row2._y > total) + total = m._row2._y; + } else if (m._row1._x > total) { + total = m._row1._x; + } + + if (total == m._row1._x) { + double val1 = sqrt(m._row1._x - -1.0 - m._row2._y - m._row3._z); + double val2 = 0.5 / val1; + _vector._x = val1 * 0.5; + _field0 = (m._row2._z - m._row3._y) * val2; + _vector._y = (m._row2._x + m._row1._y) * val2; + _vector._z = (m._row3._x + m._row1._z) * val2; + } else if (total == m._row2._y) { + double val1 = sqrt(m._row2._y - -1.0 - m._row3._z - m._row1._x); + double val2 = 0.5 / val1; + _vector._y = val1 * 0.5; + _field0 = (m._row3._x - m._row1._z) * val2; + _vector._z = (m._row3._y + m._row2._z) * val2; + _vector._x = (m._row2._x + m._row1._y) * val2; + } else if (total == m._row3._z) { + double val1 = sqrt(m._row3._z - -1.0 - m._row1._x - m._row2._y); + double val2 = 0.5 / val1; + _vector._z = val1 * 0.5; + _field0 = (m._row1._y - m._row2._x) * val2; + _vector._x = (m._row3._x + m._row1._z) * val2; + _vector._y = (m._row3._y + m._row2._z) * val2; + } + } else { + double val1 = 0.5 / sqrt(total); + _field0 = sqrt(total) * 0.5; + _vector._x = (m._row2._z - m._row3._y) * val1; + _vector._y = (m._row3._x - m._row1._z) * val1; + _vector._z = (m._row1._y - m._row2._x) * val1; + } +} + +CMatrixTransform CMatrixTransform::fn5(double percent, const CMatrixTransform &src) { + CMatrixTransform sub1 = *this; + CMatrixTransform sub2, sub4; + CMatrixTransform dest; + double val1 = sub1.fn2(src); + + if (val1 < 0.0) { + val1 = -val1; + sub2.setup(-sub1._field0, -sub1._vector._x, -sub1._vector._y, -sub1._vector._z); + sub1 = sub2; + } + + if (val1 + 1.0 <= 0.00001) { + dest._vector._x = -sub1._vector._y; + dest._vector._y = sub1._vector._x; + dest._vector._z = -sub1._field0; + dest._field0 = sub1._vector._z; + + double sin1 = sin(percent * M_PI); + double sin2 = sin((0.5 - percent) * M_PI); + dest._vector._x = sin1 * dest._vector._x + sub1._vector._x * sin2; + dest._vector._y = sub1._vector._y * sin2 + sub1._vector._x * sin1; + dest._vector._z = sin1 * -sub1._field0 + sub1._vector._z * sin2; + return dest; + } + + CMatrixTransform t1, t2; + double val2; + + if (1.0 - val1 <= 0.00001) { + val2 = 1.0 - percent; + t1 = src.resize(percent); + } else { + double cosVal = acos(val1); + double sinVal = sin(cosVal); + val2 = sin((1.0 - percent) * cosVal) / sinVal; + t1 = src.resize(sin(cosVal * percent) / sinVal); + } + + t2 = sub1.resize(val2); + dest.setup(t2._field0 + t1._field0, t1._vector._x + t2._vector._x, + t1._vector._y + t2._vector._y, t1._vector._z + t2._vector._z); + return dest; +} + +} // End of namespace Titanic diff --git a/engines/titanic/star_control/star_control_sub26.h b/engines/titanic/star_control/matrix_transform.h index 577e769767..fb7bfd3cc6 100644 --- a/engines/titanic/star_control/star_control_sub26.h +++ b/engines/titanic/star_control/matrix_transform.h @@ -20,45 +20,38 @@ * */ -#ifndef TITANIC_STAR_CONTROL_SUB26_H -#define TITANIC_STAR_CONTROL_SUB26_H +#ifndef TITANIC_MATRIX_TRANSFORM_H +#define TITANIC_MATRIX_TRANSFORM_H #include "titanic/star_control/dmatrix.h" namespace Titanic { -class CStarControlSub26 { - struct Sub { - double _v1; - double _v2; - double _v3; - - Sub() : _v1(0.0), _v2(0.0), _v3(0.0) {} - }; +class CMatrixTransform { private: - double fn2(const CStarControlSub26 *src); - const CStarControlSub26 *fn3(const CStarControlSub26 *src, double val); + double fn2(const CMatrixTransform &src); + CMatrixTransform resize(double factor) const; public: double _field0; - Sub _sub; + DVector _vector; public: - CStarControlSub26() : _field0(1.0) {} + CMatrixTransform() : _field0(1.0) {} /** * Sets the field values */ - void setup(double val1, double val2, double val3, double val4); + void setup(double val1, double x, double y, double z); /** * Copies from another instance */ - void copyFrom(const CStarControlSub26 *src); + void copyFrom(const CMatrixTransform &src); double fn1() const; void fn4(const DMatrix &m); - CStarControlSub26 fn5(double val, CStarControlSub26 *src); + CMatrixTransform fn5(double percent, const CMatrixTransform &src); }; } // End of namespace Titanic -#endif /* TITANIC_STAR_CONTROL_SUB26_H */ +#endif /* TITANIC_MATRIX_TRANSFORM_H */ diff --git a/engines/titanic/star_control/star_control_sub25.cpp b/engines/titanic/star_control/orientation_changer.cpp index 39588725fa..1aff475cf0 100644 --- a/engines/titanic/star_control/star_control_sub25.cpp +++ b/engines/titanic/star_control/orientation_changer.cpp @@ -20,32 +20,30 @@ * */ -#include "titanic/star_control/star_control_sub25.h" +#include "titanic/star_control/orientation_changer.h" #include "titanic/star_control/dmatrix.h" namespace Titanic { -void CStarControlSub25::fn1(const FMatrix &m1, const FMatrix &m2) { - _matrix1 = m1; - _matrix2 = m2; +void COrientationChanger::load(const FMatrix &minOrient, const FMatrix &maxOrient) { + _minOrient = minOrient; + _maxOrient = maxOrient; - DMatrix matrix = _matrix2; - _sub1.fn4(matrix); - matrix = _matrix2; - _sub2.fn4(matrix); + _sub1.fn4(_minOrient); + _sub2.fn4(_maxOrient); } -void CStarControlSub25::fn2(double val, FMatrix &orientation) { - if (val <= 0.0) { - orientation = _matrix1; - } else if (val > 1.0) { - orientation = _matrix2; +FMatrix COrientationChanger::getOrientation(double percent) { + if (percent <= 0.0) { + return _minOrient; + } else if (percent > 1.0) { + return _maxOrient; } else { - CStarControlSub26 sub26 = _sub1.fn5(val, &_sub2); + CMatrixTransform tfm = _sub1.fn5(percent, _sub2); DMatrix m1; - m1.fn3(&sub26); - orientation = m1; + m1.loadTransform(tfm); + return m1; } } diff --git a/engines/titanic/star_control/star_control_sub25.h b/engines/titanic/star_control/orientation_changer.h index e6a303439f..a59cb30cc4 100644 --- a/engines/titanic/star_control/star_control_sub25.h +++ b/engines/titanic/star_control/orientation_changer.h @@ -20,25 +20,35 @@ * */ -#ifndef TITANIC_STAR_CONTROL_SUB25_H -#define TITANIC_STAR_CONTROL_SUB25_H +#ifndef TITANIC_ORIENTATION_CHANGER_H +#define TITANIC_ORIENTATION_CHANGER_H #include "titanic/star_control/fmatrix.h" -#include "titanic/star_control/star_control_sub26.h" +#include "titanic/star_control/matrix_transform.h" namespace Titanic { -class CStarControlSub25 { +class COrientationChanger { public: - FMatrix _matrix1; - FMatrix _matrix2; - CStarControlSub26 _sub1; - CStarControlSub26 _sub2; + FMatrix _minOrient; + FMatrix _maxOrient; + CMatrixTransform _sub1; + CMatrixTransform _sub2; public: - void fn1(const FMatrix &m1, const FMatrix &m2); - void fn2(double val, FMatrix &orientation); + /** + * Loads the constraints for the minimum and maximum orientation + */ + void load(const FMatrix &minOrient, const FMatrix &maxOrient); + + /** + * Returns the orientation for a given percentage between the two + * extremes + * @param percent Percentage transition 0.0 to 1.0 + * @returns New orientation for the given percentage between the two + */ + FMatrix getOrientation(double percent); }; } // End of namespace Titanic -#endif /* TITANIC_STAR_CONTROL_SUB25_H */ +#endif /* TITANIC_ORIENTATION_CHANGER_H */ diff --git a/engines/titanic/star_control/star_control_sub23.cpp b/engines/titanic/star_control/star_control_sub23.cpp index b7c803d4b6..3f35481759 100644 --- a/engines/titanic/star_control/star_control_sub23.cpp +++ b/engines/titanic/star_control/star_control_sub23.cpp @@ -37,8 +37,8 @@ CStarControlSub23::CStarControlSub23() : _srcPos(0.0, 1000000.0, 0.0) { _field48 = 0; _field4C = 0; _field54 = 0; - _moveDelayCtr = 0.0; - _moveDelayInc = 0.0; + _transitionPercent = 0.0; + _transitionPercentInc = 0.0; } void CStarControlSub23::proc2(FVector &oldPos, FVector &newPos, @@ -50,17 +50,17 @@ void CStarControlSub23::proc2(FVector &oldPos, FVector &newPos, _active = false; _field34 = false; - _moveDelayCtr = 1.0; + _transitionPercent = 1.0; _field40 = -1; _field44 = -1; _field48 = -1; _field4C = 0; } -void CStarControlSub23::proc3(const FMatrix &m1, const FMatrix &m2) { +void CStarControlSub23::proc3(const FMatrix &srcOrient, const FMatrix &destOrient) { _srcPos.clear(); _destPos.clear(); - _moveDelayCtr = 1.0; + _transitionPercent = 1.0; _distance = 0.0; _active = false; _field34 = false; @@ -78,7 +78,7 @@ void CStarControlSub23::setPath(const FVector &srcV, const FVector &destV, const _field44 = -1; _field48 = -1; _field4C = -1; - _moveDelayCtr = 1.0; + _transitionPercent = 1.0; } void CStarControlSub23::proc6(int val1, int val2, float val) { @@ -89,19 +89,17 @@ void CStarControlSub23::proc6(int val1, int val2, float val) { _field48 = 31; _field3C = (double)val2 * _field38; - if (_powers.empty()) - _powers.resize(32); - - // Calculate the powers table - double exponent = 0.0, total = 0.0; + // Calculate the speeds for a graduated movement between stars + double base = 0.0, total = 0.0; + _speeds.resize(32); for (int idx = 31; idx >= 0; --idx) { - _powers[idx] = pow(4.0, exponent); - total += _powers[idx]; - exponent += 0.03125; + _speeds[idx] = pow(base, 4.0); + total += _speeds[idx]; + base += 0.03125; } for (int idx = 0; idx < 32; ++idx) { - _powers[idx] = _powers[idx] * _field3C / total; + _speeds[idx] = _speeds[idx] * _field3C / total; } } diff --git a/engines/titanic/star_control/star_control_sub23.h b/engines/titanic/star_control/star_control_sub23.h index e1e1ba08b5..dec208dc66 100644 --- a/engines/titanic/star_control/star_control_sub23.h +++ b/engines/titanic/star_control/star_control_sub23.h @@ -26,7 +26,7 @@ #include "titanic/star_control/error_code.h" #include "titanic/star_control/fmatrix.h" #include "titanic/star_control/fvector.h" -#include "titanic/star_control/star_control_sub25.h" +#include "titanic/star_control/orientation_changer.h" namespace Titanic { @@ -44,18 +44,18 @@ protected: int _field44; int _field48; int _field4C; - Common::Array<double> _powers; + Common::Array<double> _speeds; int _field54; - double _moveDelayCtr; - double _moveDelayInc; - CStarControlSub25 _sub25; + double _transitionPercent; + double _transitionPercentInc; + COrientationChanger _orientationChanger; public: CStarControlSub23(); virtual ~CStarControlSub23() {} virtual void proc2(FVector &oldPos, FVector &newPos, FMatrix &oldOrientation, FMatrix &newOrientation); - virtual void proc3(const FMatrix &m1, const FMatrix &m2); + virtual void proc3(const FMatrix &srcOrient, const FMatrix &destOrient); virtual void setPath(const FVector &srcV, const FVector &destV, const FMatrix &orientation); virtual int proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { return 2; } virtual void proc6(int val1, int val2, float val); diff --git a/engines/titanic/star_control/star_control_sub24.cpp b/engines/titanic/star_control/star_control_sub24.cpp index 48737535c5..8671fa76fd 100644 --- a/engines/titanic/star_control/star_control_sub24.cpp +++ b/engines/titanic/star_control/star_control_sub24.cpp @@ -25,11 +25,11 @@ namespace Titanic { -void CStarControlSub24::proc3(const FMatrix &m1, const FMatrix &m2) { - CStarControlSub23::proc3(m1, m2); - _sub25.fn1(m1, m2); - _moveDelayInc = 0.1; - _moveDelayCtr = 0.0; +void CStarControlSub24::proc3(const FMatrix &srcOrient, const FMatrix &destOrient) { + CStarControlSub23::proc3(srcOrient, destOrient); + _orientationChanger.load(srcOrient, destOrient); + _transitionPercentInc = 0.1; + _transitionPercent = 0.0; _field40 = _field44 = _field48 = -1; _active = true; } @@ -45,7 +45,7 @@ void CStarControlSub24::setPath(const FVector &srcV, const FVector &destV, const FVector row3 = orientation._row3; double mult = _posDelta._x * row3._x + _posDelta._y * row3._y + _posDelta._z * row3._z; - _moveDelayCtr = 1.0; + _transitionPercent = 1.0; bool flag = false; if (mult < 1.0) { @@ -57,42 +57,38 @@ void CStarControlSub24::setPath(const FVector &srcV, const FVector &destV, const } if (!flag) { - const FVector *tv; - FVector tempV1, tempV2; - FVector::addAndNormalize(tempV1, row3, _posDelta); - tv = FVector::addAndNormalize(tempV2, row3, tempV1); - tempV1 = *tv; - - tv = FVector::addAndNormalize(tempV2, row3, tempV1); - tempV1 = *tv; - - tv = FVector::addAndNormalize(tempV2, row3, tempV1); - tempV1 = *tv; - - FMatrix m1; - m1.fn1(tempV1); - _sub25.fn1(orientation, m1); - - _moveDelayCtr = 0.0; - _moveDelayInc = 0.1; + FVector tempV1; + tempV1 = row3.addAndNormalize(_posDelta); + tempV1 = row3.addAndNormalize(tempV1); + tempV1 = row3.addAndNormalize(tempV1); + tempV1 = row3.addAndNormalize(tempV1); + + FMatrix newOrient; + newOrient.fn1(tempV1); + _orientationChanger.load(orientation, newOrient); + + _transitionPercent = 0.0; + _transitionPercentInc = 0.1; _active = true; } } int CStarControlSub24::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { FVector v1, v2, v3, v4; - const FVector *tv; if (!_active) return 0; - if (_moveDelayCtr < 1.0) { - _moveDelayCtr += _moveDelayInc; - _sub25.fn2(_moveDelayCtr, orientation); + // Firstly we have to do a transition of the camera orientation from + // it's current position to one where the destination star is centered + if (_transitionPercent < 1.0) { + _transitionPercent += _transitionPercentInc; + orientation = _orientationChanger.getOrientation(_transitionPercent); errorCode.set(); return 1; } + // From here on, we handle the movement to the given destination if (!_field34) { _active = false; return 2; @@ -104,7 +100,7 @@ int CStarControlSub24::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien double val = orientation._row3._x * v3._x + orientation._row3._y * v3._y + orientation._row3._z * v3._z; bool flag = false; - if (val > 1.0) { + if (val < 1.0) { if (val >= 1.0 - 1.0e-10) flag = true; } else { @@ -113,21 +109,18 @@ int CStarControlSub24::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien } if (!flag) { - v2.addAndNormalize(v1, v2, v3); - tv = v2.addAndNormalize(v4, v2, v1); - v1 = *tv; - tv = v2.addAndNormalize(v4, v2, v1); - v1 = *tv; - tv = v2.addAndNormalize(v4, v2, v1); - v1 = *tv; + v1 = v2.addAndNormalize(v3); + v1 = v2.addAndNormalize(v1); + v1 = v2.addAndNormalize(v1); + v1 = v2.addAndNormalize(v1); orientation.fn1(v1); v2 = v1; } if (_field40 >= 0) { - double powVal = _powers[_field40]; - v1 = v2 * powVal; + double speedVal = _speeds[_field40]; + v1 = v2 * speedVal; pos += v1; --_field40; @@ -148,10 +141,10 @@ int CStarControlSub24::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien } if (_field48 >= 0) { - double powVal = _powers[31 - _field48]; - v1._y = v2._y * powVal; - v1._z = v2._z * powVal; - v1._x = v2._x * powVal; + double speedVal = _speeds[31 - _field48]; + v1._y = v2._y * speedVal; + v1._z = v2._z * speedVal; + v1._x = v2._x * speedVal; pos._y = v1._y + pos._y; pos._z = v1._z + pos._z; pos._x = pos._x + v1._x; diff --git a/engines/titanic/star_control/star_control_sub24.h b/engines/titanic/star_control/star_control_sub24.h index 565f31ebf4..4b810ed924 100644 --- a/engines/titanic/star_control/star_control_sub24.h +++ b/engines/titanic/star_control/star_control_sub24.h @@ -31,7 +31,7 @@ class CStarControlSub24 : public CStarControlSub23 { public: virtual ~CStarControlSub24() {} - virtual void proc3(const FMatrix &m1, const FMatrix &m2); + virtual void proc3(const FMatrix &srcOrient, const FMatrix &destOrient); /** * Sets the path to animate movement between diff --git a/engines/titanic/star_control/star_control_sub26.cpp b/engines/titanic/star_control/star_control_sub26.cpp deleted file mode 100644 index ce23d51330..0000000000 --- a/engines/titanic/star_control/star_control_sub26.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/star_control/star_control_sub26.h" -#include "common/textconsole.h" - -namespace Titanic { - -void CStarControlSub26::setup(double val1, double val2, double val3, double val4) { - _field0 = val1; - _sub._v1 = val2; - _sub._v2 = val3; - _sub._v3 = val4; -} - -void CStarControlSub26::copyFrom(const CStarControlSub26 *src) { - _field0 = src->_field0; - _sub = src->_sub; -} - -double CStarControlSub26::fn1() const { - return _sub._v1 * _sub._v1 + _sub._v2 * _sub._v2 + - _sub._v3 * _sub._v3 + _field0 * _field0; -} - -double CStarControlSub26::fn2(const CStarControlSub26 *src) { - return _field0 * src->_field0 + _sub._v1 * src->_sub._v1 - + _sub._v2 * src->_sub._v2 + _sub._v3 * src->_sub._v3; -} - -const CStarControlSub26 *CStarControlSub26::fn3(const CStarControlSub26 *src, double val) { - CStarControlSub26::setup(_field0 * val, _sub._v1 * val, _sub._v2 * val, _sub._v3 * val); - return src; -} - -void CStarControlSub26::fn4(const DMatrix &m) { - double total = m._row1._x + m._row3._z + m._row2._y + 1.0; - - if (total <= 0.00001) { - total = m._row3._z; - - if (m._row1._x <= m._row3._z) { - if (m._row2._y > total) - total = m._row2._y; - } else if (m._row1._x > total) { - total = m._row1._x; - } - - if (total == m._row1._x) { - double val1 = sqrt(m._row1._x - -1.0 - m._row2._y - m._row3._z); - double val2 = 0.5 / val1; - _sub._v1 = val1 * 0.5; - _field0 = (m._row2._z - m._row3._y) * val2; - _sub._v2 = (m._row2._x + m._row1._y) * val2; - _sub._v3 = (m._row3._x + m._row1._z) * val2; - } else if (total == m._row2._y) { - double val1 = sqrt(m._row2._y - -1.0 - m._row3._z - m._row1._x); - double val2 = 0.5 / val1; - _sub._v2 = val1 * 0.5; - _field0 = (m._row3._x - m._row1._z) * val2; - _sub._v3 = (m._row3._y + m._row2._z) * val2; - _sub._v1 = (m._row2._x + m._row1._y) * val2; - } else if (total == m._row3._z) { - double val1 = sqrt(m._row3._z - -1.0 - m._row1._x - m._row2._y); - double val2 = 0.5 / val1; - _sub._v3 = val1 * 0.5; - _field0 = (m._row1._y - m._row2._x) * val2; - _sub._v1 = (m._row3._x + m._row1._z) * val2; - _sub._v2 = (m._row3._y + m._row2._z) * val2; - } - } else { - double val1 = 0.5 / sqrt(total); - _field0 = sqrt(total) * 0.5; - _sub._v1 = (m._row2._z - m._row3._y) * val1; - _sub._v2 = (m._row3._x - m._row1._z) * val1; - _sub._v3 = (m._row1._y - m._row2._x) * val1; - } -} - -CStarControlSub26 CStarControlSub26::fn5(double val, CStarControlSub26 *src) { - CStarControlSub26 sub1 = *this; - CStarControlSub26 sub2, sub3, sub4; - CStarControlSub26 dest; - double val1 = sub1.fn2(src); - - if (val1 < 0.0) { - val1 = -val1; - sub2.setup(-sub1._field0, -sub1._sub._v1, -sub1._sub._v2, -sub1._sub._v3); - sub1 = sub2; - } - - if (val1 + 1.0 <= 0.00001) { - dest._sub._v1 = -sub1._sub._v2; - dest._sub._v2 = sub1._sub._v1; - dest._sub._v3 = -sub1._field0; - dest._field0 = sub1._sub._v3; - - double sin1 = sin(val * M_PI); - double sin2 = sin((0.5 - val) * M_PI); - dest._sub._v1 = sin1 * dest._sub._v1 + sub1._sub._v1 * sin2; - dest._sub._v2 = sub1._sub._v2 * sin2 + sub1._sub._v1 * sin1; - dest._sub._v3 = sin1 * -sub1._field0 + sub1._sub._v3 * sin2; - return dest; - } else { - const CStarControlSub26 *sp; - double val2; - - if (1.0 - val1 <= 0.00001) { - val2 = 1.0 - val; - sp = src->fn3(&sub3, val); - } else { - double cosVal = acos(val1); - double sinVal = sin(cosVal); - val2 = sin((1.0 - val) * cosVal) / sinVal; - sp = src->fn3(&sub3, sin(cosVal * val) / sinVal); - } - - const CStarControlSub26 *sp2 = sub1.fn3(&sub4, val2); - dest.setup(sp2->_field0 + sp->_field0, sp->_sub._v1 + sp2->_sub._v1, - sp->_sub._v2 + sp2->_sub._v2, sp->_sub._v3 + sp2->_sub._v3); - return dest; - } -} - -} // End of namespace Titanic diff --git a/engines/titanic/star_control/star_control_sub27.cpp b/engines/titanic/star_control/star_control_sub27.cpp index 3c56b7d93e..1664a1f1e5 100644 --- a/engines/titanic/star_control/star_control_sub27.cpp +++ b/engines/titanic/star_control/star_control_sub27.cpp @@ -37,14 +37,14 @@ void CStarControlSub27::proc2(FVector &oldPos, FVector &newPos, } if (newPos != oldPos) { - _sub25.fn1(oldOrientation, newOrientation); - _moveDelayCtr = 0.0; + _orientationChanger.load(oldOrientation, newOrientation); + _transitionPercent = 0.0; if (_field4C == 0) { - _moveDelayInc = 0.1; + _transitionPercentInc = 0.1; _active = true; } else { - _moveDelayInc = 1.0 / distance; + _transitionPercentInc = 1.0 / distance; _active = true; } } @@ -54,13 +54,13 @@ int CStarControlSub27::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien if (!_active) return 0; - _moveDelayCtr += _moveDelayInc; - _sub25.fn2(_moveDelayCtr, orientation); + _transitionPercent += _transitionPercentInc; + orientation = _orientationChanger.getOrientation(_transitionPercent); errorCode.set(); if (_field40 >= 0) { - double powVal = _powers[_field40]; - pos += _posDelta * powVal; + double speedVal = _speeds[_field40]; + pos += _posDelta * speedVal; getVectorOnPath(pos); --_field40; @@ -74,8 +74,8 @@ int CStarControlSub27::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien errorCode.set(); return 1; } else if (_field48 >= 0) { - double powVal = _powers[31 - _field48]; - pos += _posDelta * powVal; + double speedVal = _speeds[31 - _field48]; + pos += _posDelta * speedVal; getVectorOnPath(pos); --_field48; diff --git a/graphics/pixelformat.cpp b/graphics/pixelformat.cpp index 0a46411254..3134600c52 100644 --- a/graphics/pixelformat.cpp +++ b/graphics/pixelformat.cpp @@ -58,7 +58,7 @@ Common::String PixelFormat::toString() const { digits += '0' + 8 - componentLoss; } - return letters + digits; + return letters + digits + '@' + ('0' + bytesPerPixel); } } // End of namespace Graphics diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex f666d3ddad..6957a91bc2 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/po/be_BY.po b/po/be_BY.po index 1e4b7d9ee1..ba96624db0 100644 --- a/po/be_BY.po +++ b/po/be_BY.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-31 15:15+0000\n" "Last-Translator: Ivan Lukyanov <lid-gr@tut.by>\n" "Language-Team: Belarusian <https://translations.scummvm.org/projects/scummvm/" @@ -919,7 +919,7 @@ msgid "Special dithering modes supported by some games" msgstr "ÁßÕæëïÛìÝëï àíÖëÜë àíÝÔíàëÝÓã, ßÐÔâàëÜÞþÒÐÝëï ÝÕÚÐâÞàëÜö ÓãÛìÝïÜö" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "¿ÞþÝÐíÚàÐÝÝë àíÖëÜ" @@ -2251,52 +2251,52 @@ msgstr "ÀíÖëÜ ÐþâÐÔàíÓã ×ÐàÐ×" msgid "Swipe three fingers to the right to toggle." msgstr "¿àÐÒïÔ×öæÕ âàëÜÐ ßÐÛìæÐÜö ÝÐßàÐÒÐ ÔÛï ßÕàÐÚÛîçíÝÝï." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "°ÚÞÝÝë àíÖëÜ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "°ÔàÞ×ÝÕÝÝÕ: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "ºÐàíÚæëï áãÐÔÝÞáöÝ ÑÐÚÞþ ãÚÛîçÐÝÐ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "ºÐàíÚæëï áãÐÔÝÞáöÝ ÑÐÚÞþ ÒëÚÛîçÐÝÐ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "ÄöÛìâàÐæëï þÚÛîçÐÝÐ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "ÄöÛìâàÐæëï ÒëÚÛîçÐÝÐï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "±Õ× ßÐÒÕÛöçíÝÝï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "±Õ× ßÐÒÕÛöçíÝÝï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "°ÚâëþÝë ÓàÐäöçÝë äöÛìâà:" @@ -3612,7 +3612,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3620,7 +3620,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3629,7 +3629,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3642,7 +3642,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/ca_ES.po b/po/ca_ES.po index f915bf0f23..9eb1b1bb83 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-02-20 14:15+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Catalan <https://translations.scummvm.org/projects/scummvm/" @@ -921,7 +921,7 @@ msgid "Special dithering modes supported by some games" msgstr "Modes de tramat especials suportats per alguns jocs" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Mode pantalla completa" @@ -2234,52 +2234,52 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Mode de finestra" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "S'ha activat la correcció de la relació d'aspecte" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "S'ha desactivat la correcció de la relació d'aspecte" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtratge activat" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtratge desactivat" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (sense escalar)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (no escalat)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Filtre de gràfics actiu:" @@ -3584,7 +3584,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3592,7 +3592,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3601,7 +3601,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3614,7 +3614,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 13c97e1005..6a81e15056 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.7.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-04 15:43+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Czech <https://translations.scummvm.org/projects/scummvm/" @@ -919,7 +919,7 @@ msgid "Special dithering modes supported by some games" msgstr "Speciální re¾imy chvìní podporované nìkterými hrami" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Re¾im celé obrazovky" @@ -2250,54 +2250,54 @@ msgstr "Re¾im automatického ta¾ení je nyní" msgid "Swipe three fingers to the right to toggle." msgstr "Pro zapnutí pøejeïte tøemi prsty doprava." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Re¾im do okna" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Povolena korekce pomìru stran" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Zakázána korekce pomìru stran" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Kliknutí Povoleno" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Kliknutí Zakázáno" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normální (bez zmìny velikosti)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normální (bez zmìny velikosti)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktivní grafický filtr:" @@ -3604,7 +3604,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3612,7 +3612,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3621,7 +3621,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3634,7 +3634,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/da_DK.po b/po/da_DK.po index e4b31799fb..6c05b8c802 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-29 07:29+0000\n" "Last-Translator: poulsen93 <poulsen93@gmail.com>\n" "Language-Team: Danish <https://translations.scummvm.org/projects/scummvm/" @@ -913,7 +913,7 @@ msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understøttet a nogle spil" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Fuldskærms tilstand" @@ -2241,54 +2241,54 @@ msgstr "Auto-træk tilstand er nu" msgid "Swipe three fingers to the right to toggle." msgstr "Før tre fingre til højre for at skifte." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Vindue tilstand" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Aktivér billedformat korrektion" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Deaktivér billedformat korrektion" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Klik aktiveret" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Klik deaktiveret" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktive grafik filtre:" @@ -3605,7 +3605,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3613,7 +3613,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3622,7 +3622,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3635,7 +3635,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/de_DE.po b/po/de_DE.po index a4db3bebe7..648d4f2f45 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.10.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" -"PO-Revision-Date: 2017-05-20 10:21+0000\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" +"PO-Revision-Date: 2017-05-22 15:13+0000\n" "Last-Translator: Lothar Serra Mari <rootfather@scummvm.org>\n" "Language-Team: German <https://translations.scummvm.org/projects/scummvm/" "scummvm/de/>\n" @@ -925,7 +925,7 @@ msgid "Special dithering modes supported by some games" msgstr "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstützt" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Vollbildmodus" @@ -2271,52 +2271,52 @@ msgstr "Automatisches Ziehen ist jetzt" msgid "Swipe three fingers to the right to toggle." msgstr "Zum Umschalten mit drei Fingern nach rechts wischen." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Fenstermodus" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Auflösung: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Seitenverhältniskorrektur an" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Seitenverhältniskorrektur aus" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Bilineare Filterung aktiviert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Bilineare Filterung deaktiviert" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (keine Skalierung)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal ohn.Skalieren" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktiver Grafikfilter:" @@ -3659,15 +3659,19 @@ msgstr "" "Sie die Konsole auf weitere Informationen und stellen Sie sicher, dass Ihre " "Spieldateien korrekt sind." -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " "riddles. Please, apply the latest patch for this game by Sierra to avoid " "possible problems." msgstr "" +"Ein bekannter Fehler im Spiel-Skript wurde erkannt, der möglicherweise den " +"weiteren Spielfortschritt innerhalb des \"Green Man\"-Rätsels verhindert. " +"Bitte wenden Sie den letzten Patch an, den Sierra für dieses Spiel " +"veröffentlicht hat, um mögliche Probleme zu vermeiden." -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3675,8 +3679,14 @@ msgid "" "not always render properly or reflect the actual game speech. This is not a " "ScummVM bug -- it is a problem with the game's assets." msgstr "" - -#: engines/sci/sci.cpp:403 +"Untertitel sind aktiviert, die Untertitel in King's Quest 7 wurden jedoch " +"nicht fertiggestellt und im veröffentlichten Spiel deaktiviert. ScummVM " +"erlaubt, dass die Untertitel trotzdem aktiviert werden. Da diese jedoch im " +"Originalspiel entfernt wurden, werden sie nicht immer korrekt dargestellt " +"oder weichen von der Sprachausgabe ab. Dies ist kein Fehler in ScummVM -- es " +"ist ein Problem mit den Spieldaten." + +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3688,8 +3698,18 @@ msgid "" "place it in the game folder. Without this patch, General MIDI music for this " "game will sound badly distorted." msgstr "" - -#: engines/sci/sci.cpp:422 +"Sie haben General MIDI als Audio-Gerät ausgewählt. Sierra bietet für dieses " +"Spiel Unterstützung von General MIDI über das \"General MIDI Utility\" an, " +"welches separat erhältlich war. Bitte installieren Sie diesen Patch, um MIDI-" +"Musik in diesem Spiel zu erleben. Nachdem Sie den Patch erhalten haben, " +"können Sie alle darin befindlichen *.PAT-Dateien in Ihr ScummVM Extra-" +"Verzeichnis entpacken. ScummVM wird den passenden Patch dann automatisch " +"auswählen. Alternativ können Sie die Anweisungen in der READ.ME-Datei " +"befolgen, die mit dem Patch mitgeliefert wird, und die zugehörige *.PAT-" +"Datei in 4.PAT umbenennen und im Spiele-Verzeichnis ablegen. Ohne diesen " +"Patch wird die General MIDI-Musik erheblich verzerrt sein." + +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " @@ -3697,6 +3717,12 @@ msgid "" "remove this patch from your game folder in order to avoid having unexpected " "errors and/or issues later on." msgstr "" +"Ihr Spiel wurde mit einem von Fans erstellten Patch gepatcht. Solche Patches " +"sind dafür bekannt, Fehler zu verursachen, da sie die Spiel-Skripte " +"umfangreich verändern. Die Fehler, die durch solche Patches behoben werden " +"treten nicht in ScummVM auf, weshalb Sie diesen Patch aus Ihrem Spiel-" +"Verzeichnis entfernen sollten, um unerwartete Fehler und/oder Probleme zu " +"verhindern." #: engines/scumm/detection.cpp:1120 msgid "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.10.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-04-28 11:12+0000\n" "Last-Translator: Arius <alidop@pathfinder.gr>\n" "Language-Team: Greek <https://translations.scummvm.org/projects/scummvm/" @@ -933,7 +933,7 @@ msgstr "" "ïñéóìÝíá ðáé÷íßäéá" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Ëåéôïõñãßá ðëÞñïõò ïèüíçò" @@ -2279,52 +2279,52 @@ msgstr "Ç ëåéôïõñãßá auto-drag åßíáé ôþñá" msgid "Swipe three fingers to the right to toggle." msgstr "ÐåñÜóôå ôñßá äÜ÷ôõëá ðñïò ôá äåîéÜ ãéá åíáëëáãÞ." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Ëåéôïõñãßá ðáñáèýñïõ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "ÁíÜëõóç: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "ÅíåñãïðïéçìÝíç äéüñèùóç áíáëïãßáò äéáóôÜóåùí" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "ÁðåíåñãïðïéçìÝíç äéüñèùóç áíáëïãßáò äéáóôÜóåùí" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Åíåñãïðïßçóç öéëôñáñßóìáôïò" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Áðåíåñãïðïßçóç öéëôñáñßóìáôïò" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Êáíïíéêü (÷ùñßò êëéìÜêùóç)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Êáíïíéêü (÷ùñßò êëéìÜêùóç)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Åíåñãü ößëôñï ãñáöéêþí:" @@ -3652,7 +3652,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3660,7 +3660,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3669,7 +3669,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3682,7 +3682,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/es_ES.po b/po/es_ES.po index 04aa9e987b..1e29d8513a 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-04-23 05:59+0000\n" "Last-Translator: Santiago Sanchez <sanchez.santiago.j@gmail.com>\n" "Language-Team: Spanish <https://translations.scummvm.org/projects/scummvm/" @@ -921,7 +921,7 @@ msgid "Special dithering modes supported by some games" msgstr "Modos especiales de difuminado compatibles con algunos juegos" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Pantalla completa" @@ -2257,52 +2257,52 @@ msgstr "El modo de arrastre automático está" msgid "Swipe three fingers to the right to toggle." msgstr "Desliza tres dedos hacia la derecha para cambiar de modo." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Modo ventana" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Resolución: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Activar la corrección de aspecto" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Desactivar la corrección de aspecto" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtrado activado" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtrado desactivado" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (sin reescalado)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Filtro de gráficos activo:" @@ -3615,7 +3615,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3623,7 +3623,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3632,7 +3632,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3645,7 +3645,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-04 13:27+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Basque <https://translations.scummvm.org/projects/scummvm/" @@ -913,7 +913,7 @@ msgid "Special dithering modes supported by some games" msgstr "Joko batzuk onarturiko lausotze-modu bereziak" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Pantaila osoa" @@ -2244,54 +2244,54 @@ msgstr "Auto-arrastatzea orain" msgid "Swipe three fingers to the right to toggle." msgstr "Pasatu hiru atzamar eskuinean gaitu/desgaitzeko." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Leiho modua" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Formatu-ratio zuzenketa gaituta" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Formatu-ratio zuzenketa desgaituta" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Klikatzea gaituta" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Klikatzea desgaituta" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normala (eskalatu gabe)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normala" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Filtro grafiko aktiboa:" @@ -3610,7 +3610,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3618,7 +3618,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3627,7 +3627,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3640,7 +3640,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/fi_FI.po b/po/fi_FI.po index 4ef902fbfe..e1eb40e7ea 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" -"PO-Revision-Date: 2017-05-08 19:19+0000\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" +"PO-Revision-Date: 2017-05-21 13:31+0000\n" "Last-Translator: Timo Mikkolainen <tmikkola@gmail.com>\n" "Language-Team: Finnish <https://translations.scummvm.org/projects/scummvm/" "scummvm/fi/>\n" @@ -916,7 +916,7 @@ msgid "Special dithering modes supported by some games" msgstr "Erityiset dithering asetukset joita jotkut pelit tukevat" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Kokoruututila" @@ -2240,52 +2240,52 @@ msgstr "Automaattiraahaustila on nyt" msgid "Swipe three fingers to the right to toggle." msgstr "Muuta tilaa pyyhkäisemällä kolmella sormella oikealle." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Ikkunoitu tila" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Resoluutio: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Kuvasuhteen korjaus päällä" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Kuvasuhteen korjaus pois päältä" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Suodatus päällä" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Suodatus pois päältä" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normaali (ei skaalausta)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normaali (ei skaalausta)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Valittu grafiikkasuodatin:" @@ -3602,8 +3602,7 @@ msgstr "" "saattavat toimia väärin. Etsi mahdollisia lisätietoja konsolista ja tarkista " "että pelitiedostosi ovat kunnossa." -#: engines/sci/sci.cpp:370 -#, fuzzy +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3612,9 +3611,9 @@ msgid "" msgstr "" "Pelistä havaittiin tunnetusti viallinen tiedosto, joka saattaa estää pelissä " "etenemisen Green Man:in arvoitusten kohdilla. Ole hyvä ja asenna viimeisin " -"korjaus Sierra:lta välttääksesi mahdolliset ongelmat" +"korjaus Sierra:lta välttääksesi mahdolliset ongelmat." -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3628,7 +3627,7 @@ msgstr "" "piirry oikein tai vastaa pelissä esiintyvää puhetta. Tämä ei ole vika " "ScummVM:ssä, vaan ongelma pelissä itsessään." -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3649,7 +3648,7 @@ msgstr "" "tiedoston 4.PAT:iksi sekä siirtää sen pelikansioon. Ilman tätä korjausta " "pelin MIDI-musiikki kuulostaa pahasti vääristyneeltä." -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/fr_FR.po b/po/fr_FR.po index a6fac1b6fe..c69104fd90 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-04-23 15:57+0000\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <https://translations.scummvm.org/projects/scummvm/" @@ -923,7 +923,7 @@ msgid "Special dithering modes supported by some games" msgstr "Mode spécial de tramage supporté par certains jeux" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Plein écran" @@ -2263,52 +2263,52 @@ msgstr "Le mode glisser-auto est maintenant" msgid "Swipe three fingers to the right to toggle." msgstr "Glissez trois doigts vers la droite pour changer de mode." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Mode Fenêtre" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Résolution : %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Activer la correction du rapport d'aspect" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Désactiver la correction du rapport d'aspect" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtrage Activé" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtrage Désactivé" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (échelle d'origine)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Mode graphique actif :" @@ -3626,7 +3626,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3634,7 +3634,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3643,7 +3643,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3656,7 +3656,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/gl_ES.po b/po/gl_ES.po index be90a43513..feac51341f 100644 --- a/po/gl_ES.po +++ b/po/gl_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-11-28 15:51+0000\n" "Last-Translator: Santiago G. Sanz <santiagogarciasanz@gmail.com>\n" "Language-Team: Galician <https://translations.scummvm.org/projects/scummvm/" @@ -918,7 +918,7 @@ msgid "Special dithering modes supported by some games" msgstr "Modos de interpolación de cores compatibles con algúns xogos" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Pantalla completa" @@ -2253,52 +2253,52 @@ msgstr "O modo Autoarrastrar está" msgid "Swipe three fingers to the right to toggle." msgstr "Arrastra tres dedos á dereita para cambiar o estado." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Modo en ventá" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Resolución: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Corrección de proporción activada" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Corrección de proporción desactivada" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtrado activado" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtrado desactivado" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (sen escala)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (sen escala)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Filtro de gráficos activo:" @@ -3620,7 +3620,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3628,7 +3628,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3637,7 +3637,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3650,7 +3650,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/hu_HU.po b/po/hu_HU.po index 74d3911e29..5a36a225cc 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-04-23 03:06+0000\n" "Last-Translator: George Kormendi <grubycza@hotmail.com>\n" "Language-Team: Hungarian <https://translations.scummvm.org/projects/scummvm/" @@ -913,7 +913,7 @@ 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:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Teljesképernyõs mód" @@ -2232,52 +2232,52 @@ msgstr "Auto-húz módban van" msgid "Swipe three fingers to the right to toggle." msgstr "Üsd három újjal hogy biztosan váltson." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Ablakos mód" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Felbontás: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Méretarány korrekció engedélyezve" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Méretarány korrekció letiltva" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Szûrés engedélyezve" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Szûrés letiltva" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normál (nincs átméretezés)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normál (nincs átméretezés)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktív grafikus szûrõk:" @@ -3581,7 +3581,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3589,7 +3589,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3598,7 +3598,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3611,7 +3611,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/it_IT.po b/po/it_IT.po index 22bdc8efab..618ca3ac7c 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-05-21 11:27+0000\n" "Last-Translator: Paolo Bossi <pbossi86@gmail.com>\n" -"Language-Team: Italian " -"<https://translations.scummvm.org/projects/scummvm/scummvm/it/>\n" +"Language-Team: Italian <https://translations.scummvm.org/projects/scummvm/" +"scummvm/it/>\n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -921,7 +921,7 @@ msgid "Special dithering modes supported by some games" msgstr "Modalità di resa grafica speciali supportate da alcuni giochi" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Modalità a schermo intero" @@ -2257,52 +2257,52 @@ msgstr "La modalità di autotrascimento è ora" msgid "Swipe three fingers to the right to toggle." msgstr "Fai scivolare tre dita verso destra per cambiare." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Modalità finestra" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Risoluzione: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Correzione proporzioni attivata" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Correzione proporzioni disattivata" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtro video attivato" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtro disattivato" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normale (nessun ridimensionamento)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normale (no ridim.)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Filtro grafico attivo:" @@ -3632,7 +3632,7 @@ msgstr "" "ulteriori informazioni e verificare che i file di dati del gioco siano " "validi." -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3644,7 +3644,7 @@ msgstr "" "indovinelli del \"Green Man\". Applicare l'ultima patch ufficiale " "rilasciata da Sierra per evitare possibili problemi." -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3659,7 +3659,7 @@ msgstr "" "completamente e possono non coincidere con il parlato effettivo. Questo non " "è un bug di ScummVM -- è un problema dei dati di gioco." -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3681,7 +3681,7 @@ msgstr "" "associato in 4.PAT e metterlo nella cartella del gioco. Senza questa patch, " "la musica in MIDI risulterà pesantemente distorta." -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/nb_NO.po b/po/nb_NO.po index adf8acc33a..0a8280e52e 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-26 17:36+0000\n" "Last-Translator: Einar Johan Trøan Sømåen <einarjohants@gmail.com>\n" "Language-Team: Norwegian Bokmål <https://translations.scummvm.org/projects/" @@ -921,7 +921,7 @@ msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus støttet av enkelte spill" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" @@ -2242,52 +2242,52 @@ msgstr "Auto-dramodus er nå" msgid "Swipe three fingers to the right to toggle." msgstr "Sveip tre fingre til høyre for å veksle." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Vindusmodus" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Oppløsning: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Aspekt-rate korrigering aktivert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Aspekt-rate korrigering deaktivert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtrering aktivert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtrering deaktivert" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (ingen skalering)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktivt grafikkfilter:" @@ -3592,7 +3592,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3600,7 +3600,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3609,7 +3609,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3622,7 +3622,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/nl_NL.po b/po/nl_NL.po index c7eaf3a337..10e41c07c3 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.9.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" -"PO-Revision-Date: 2017-05-09 05:21+0000\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" +"PO-Revision-Date: 2017-05-22 05:36+0000\n" "Last-Translator: Ben Castricum <github@bencastricum.nl>\n" "Language-Team: Dutch <https://translations.scummvm.org/projects/scummvm/" "scummvm/nl/>\n" @@ -920,7 +920,7 @@ msgid "Special dithering modes supported by some games" msgstr "Speciale ditheringmodi die door sommige games ondersteund worden" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Volledig-scherm modus" @@ -2249,52 +2249,52 @@ msgstr "Auto-sleep modus is nu" msgid "Swipe three fingers to the right to toggle." msgstr "Swipe drie vingers naar rechts om te schakelen." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Venstermodus" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Resolutie: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Pixelverhoudingcorrectie ingeschakeld" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Pixelverhoudingcorrectie uitgeschakeld" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filteren aangezet" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filteren uitgeschakeld" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normaal (niet schalen)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normaal (niet schalen)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Actieve grafische filter:" @@ -3629,8 +3629,7 @@ msgstr "" "features zullen mogelijk niet goed werken. Controleer a.u.b. de console voor " "meer informatie, en verifieer dat uw spel bestanden juist zijn." -#: engines/sci/sci.cpp:370 -#, fuzzy +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3641,9 +3640,9 @@ msgstr "" "later in het spel verder kunt tijdens het gedeelte met de raadsels van de " "Green Man.\n" "Pas a.u.b. de meest recente patch van Sierra voor dit spel toe om mogelijke " -"problemen te voorkomen" +"problemen te voorkomen." -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3658,7 +3657,7 @@ msgstr "" "worden of overeenkomen met de spraak van het spel. Dit is geen ScummVM fout, " "maar een probleem met de speldata." -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3680,7 +3679,7 @@ msgstr "" "hernoemen naar 4.PAT en deze dan in de spel folder plaatsen. Zonder deze " "patch zal General MIDI muziek sterk verminkt klinken." -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/nn_NO.po b/po/nn_NO.po index b485e5e49d..95770b120c 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-18 18:23+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Norwegian Nynorsk <https://translations.scummvm.org/projects/" @@ -913,7 +913,7 @@ msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som støttast av nokre spel" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" @@ -2235,54 +2235,54 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "Sveip tre fingre til høgre for å veksle." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Vindusmodus" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Aspekt-korrigering aktivert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Aspekt-korrigering ikkje aktivert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Klikking aktivert" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Klikking Deaktivert" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (ikkje skaler)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (ikkje skaler)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktivt grafikkfilter:" @@ -3557,7 +3557,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3565,7 +3565,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3574,7 +3574,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3587,7 +3587,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/pl_PL.po b/po/pl_PL.po index c9672bf26d..b8cbb4633e 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-01-25 12:49+0000\n" "Last-Translator: Rafa³ Rzepecki <divided.mind@gmail.com>\n" "Language-Team: Polish <https://translations.scummvm.org/projects/scummvm/" @@ -919,7 +919,7 @@ msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektóre gry" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Pe³ny ekran" @@ -2244,54 +2244,54 @@ msgstr "Tryb automatycznego przeci±gania jest" msgid "Swipe three fingers to the right to toggle." msgstr "Przesuñ trzema palcami, ¿eby zmieniæ." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Okno" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "W³±czono korekcjê formatu obrazu" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Wy³±czono korekcjê formatu obrazu" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Klikanie w³±czone" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Klikanie wy³±czone" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Zwyk³y (bez skalowania)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Zwyk³y (bez skalowania)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktywny filtr graficzny:" @@ -3599,7 +3599,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3607,7 +3607,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3616,7 +3616,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3629,7 +3629,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/pt_BR.po b/po/pt_BR.po index fdaef8d524..0b2b1d8fc7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-03-03 22:26+0000\n" "Last-Translator: rafaelmessias <rmmartins@gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://translations.scummvm.org/" @@ -931,7 +931,7 @@ msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" @@ -2281,55 +2281,55 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 #, fuzzy msgid "OpenGL" msgstr "Abrir" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Modo janela" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Correção de proporção habilitada" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Correção de proporção desabilitada" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Clicando Habilitado" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Clicando Desabilitado" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normal (sem escala)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normal (sem escala)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Ativa os filtros gráficos:" @@ -3641,7 +3641,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3649,7 +3649,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3658,7 +3658,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3671,7 +3671,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/pt_PT.po b/po/pt_PT.po index aef8846fc5..1d222b1b2a 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.10.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-01-30 14:50+0000\n" "Last-Translator: Vitor Santos <vitorhgsantos90@gmail.com>\n" "Language-Team: Portuguese (Portugal) <https://translations.scummvm.org/" @@ -930,7 +930,7 @@ msgid "Special dithering modes supported by some games" msgstr "Modos especiais de pontilhado suportados por alguns jogos" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Modo de ecrã inteiro" @@ -2200,52 +2200,52 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "" @@ -3478,7 +3478,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3486,7 +3486,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3495,7 +3495,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3508,7 +3508,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/ru_RU.po b/po/ru_RU.po index ffb5713e4e..2e48be9d9f 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-04-23 05:57+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian <https://translations.scummvm.org/projects/scummvm/" @@ -918,7 +918,7 @@ msgid "Special dithering modes supported by some games" msgstr "ÁßÕæØÐÛìÝëÕ àÕÖØÜë àÕÝÔÕàØÝÓÐ, ßÞÔÔÕàÖØÒÐÕÜëÕ ÝÕÚÞâÞàëÜØ ØÓàÐÜØ" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "¿ÞÛÝÞíÚàÐÝÝëÙ àÕÖØÜ" @@ -2250,52 +2250,52 @@ msgstr "ÀÕÖØÜ ÐÒâÞÔàíÓÐ áÕÙçÐá" msgid "Swipe three fingers to the right to toggle." msgstr "¿àÞÒÕÔØâÕ âàÕÜï ßÐÛìæÐÜØ ÝÐßàÐÒÞ ÔÛï ßÕàÕÚÛîçÕÝØï." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "¾ÚÞÝÝëÙ àÕÖØÜ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "ÀÐ×àÕèÕÝØÕ: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "ºÞààÕÚæØï áÞÞâÝÞèÕÝØï áâÞàÞÝ ÒÚÛîçÕÝÐ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "ºÞààÕÚæØï áÞÞâÝÞèÕÝØï áâÞàÞÝ ÒëÚÛîçÕÝÐ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "ÄØÛìâàÐæØï ÒÚÛîçÕÝÐ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "ÄØÛìàÐæØï ÒëÚÛîçÕÝÐ" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "±Õ× ãÒÕÛØçÕÝØï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "±Õ× ãÒÕÛØçÕÝØï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "°ÚâØÒÝëÙ ÓàÐäØçÕáÚØÙ äØÛìâà:" @@ -3611,7 +3611,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3619,7 +3619,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3628,7 +3628,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3641,7 +3641,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/scummvm.pot b/po/scummvm.pot index 7e069d06ab..da9a2a32bd 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.10.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -896,7 +896,7 @@ msgid "Special dithering modes supported by some games" msgstr "" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "" @@ -2165,52 +2165,52 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "" @@ -3443,7 +3443,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3451,7 +3451,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3460,7 +3460,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3473,7 +3473,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/sv_SE.po b/po/sv_SE.po index 73e4832fc4..fe3cc5bca6 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-01-06 09:18+0000\n" "Last-Translator: Petter Sjölund <ignalina@mac.com>\n" "Language-Team: Swedish <https://translations.scummvm.org/projects/scummvm/" @@ -922,7 +922,7 @@ msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlägen stödda av vissa spel" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Fullskärmsläge" @@ -2249,52 +2249,52 @@ msgstr "Automatiskt dragläge" msgid "Swipe three fingers to the right to toggle." msgstr "Svep åt höger med tre fingrar för att byta läge." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Fönsterläge" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "Upplösning: %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Korrektion av bildförhållande på" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Korrektion av bildförhållande av" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "Filtrering aktiverat" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "Filtrering är inaktiverat" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Normalt (ingen skalning)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Normalt (ingen skalning)" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Aktivt grafikfilter:" @@ -3609,7 +3609,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3617,7 +3617,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3626,7 +3626,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3639,7 +3639,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/uk_UA.po b/po/uk_UA.po index a5734fdd11..f10c044f72 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.9.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2017-04-23 05:56+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Ukrainian <https://translations.scummvm.org/projects/scummvm/" @@ -918,7 +918,7 @@ msgid "Special dithering modes supported by some games" msgstr "ÁßÕæöÐÛìÝö àÕÖØÜØ àÐáâàãÒÐÝÝï, ïÚö ßöÔâàØÜãîâì ÔÕïÚö öÓàØ" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "¿ÞÒÝÞÕÚàÐÝÝØÙ àÕÖØÜ" @@ -2248,52 +2248,52 @@ msgstr "ÀÕÖØÜ áÐÜÞâïÓÝÕÝÝï ÒÚÛîçÕÝÞ" msgid "Swipe three fingers to the right to toggle." msgstr "¿àÞÒÕÔöâì âàìÞÜÐ ßÐÛìæïÜö ÝÐßàÐÒÞ ÔÛï ßÕàÕÚÛîçÕÝÝï." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "²öÚÞÝÝØÙ àÕÖØÜ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "ÀÞ×ÓÐÛãÖÕÝÝï %dx%d" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "ºÞàÕÚæöî áßöÒÒöÔÝÞèÕÝÝï áâÞàöÝ ãÒöÜÚÝÕÝÞ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "ºÞàÕÚæöî áßöÒÒöÔÝÞèÕÝÝï áâÞàöÝ ÒØÜÚÝÕÝÞ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 msgid "Filtering enabled" msgstr "ÄöÛìâàãÒÐÝÝï ãÒöÜÚÝÕÝÞ" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 msgid "Filtering disabled" msgstr "ÄöÛìâàãÒÐÝÝï ÒØÜÚÝÕÝÞ" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "±Õ× ×ÑöÛìèÕÝÝï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "±Õ× ×ÑöÛìèÕÝÝï" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "¿ÞâÞçÝØÙ ÓàÐäöçÝØÙ äöÛìâà:" @@ -3602,7 +3602,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3610,7 +3610,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3619,7 +3619,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3632,7 +3632,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po index 2a5dfb7bf9..e8b4311a9f 100644 --- a/po/zh-Latn_CN.po +++ b/po/zh-Latn_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.9.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-05-21 04:20+0200\n" +"POT-Creation-Date: 2017-05-24 06:16+0200\n" "PO-Revision-Date: 2016-12-26 19:38+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Chinese <https://translations.scummvm.org/projects/scummvm/" @@ -909,7 +909,7 @@ msgid "Special dithering modes supported by some games" msgstr "Youxi Zhichi Teshu de Doudong Moshi" #: gui/options.cpp:1046 backends/graphics/openglsdl/openglsdl-graphics.cpp:616 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2508 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2570 msgid "Fullscreen mode" msgstr "Quanping Moshi" @@ -2237,54 +2237,54 @@ msgstr "Muqian Wei Zidong Tuozhuai Moshi" msgid "Swipe three fingers to the right to toggle." msgstr "Xiangyou Huadong San Gen Shouzhi Qiehuan." -#: backends/graphics/opengl/opengl-graphics.cpp:146 +#: backends/graphics/opengl/opengl-graphics.cpp:151 msgid "OpenGL" msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:618 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2510 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2572 msgid "Windowed mode" msgstr "Chuangkou Moshi" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:728 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:732 #, c-format msgid "Resolution: %dx%d" msgstr "" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:749 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2386 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2448 msgid "Enabled aspect ratio correction" msgstr "Qiyong Bili Jiaozheng" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:751 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2392 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2454 msgid "Disabled aspect ratio correction" msgstr "Jinyong Bili Jiaozheng" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:771 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2410 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:775 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2472 #, fuzzy msgid "Filtering enabled" msgstr "Qidong Dianji" -#: backends/graphics/openglsdl/openglsdl-graphics.cpp:773 -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2412 +#: backends/graphics/openglsdl/openglsdl-graphics.cpp:777 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2474 #, fuzzy msgid "Filtering disabled" msgstr "Jinyong Dianji" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:52 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:56 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:95 msgid "Normal (no scaling)" msgstr "Putong" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:71 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:75 msgctxt "lowres" msgid "Normal (no scaling)" msgstr "Putong" -#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2465 +#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2527 msgid "Active graphics filter:" msgstr "Huodong de Tuxing Guolvqi:" @@ -3588,7 +3588,7 @@ msgid "" "that your game files are valid." msgstr "" -#: engines/sci/sci.cpp:370 +#: engines/sci/sci.cpp:371 msgid "" "A known buggy game script has been detected, which could prevent you from " "progressing later on in the game, during the sequence with the Green Man's " @@ -3596,7 +3596,7 @@ msgid "" "possible problems." msgstr "" -#: engines/sci/sci.cpp:379 +#: engines/sci/sci.cpp:380 msgid "" "Subtitles are enabled, but subtitling in King's Quest 7 was unfinished and " "disabled in the release version of the game. ScummVM allows the subtitles to " @@ -3605,7 +3605,7 @@ msgid "" "ScummVM bug -- it is a problem with the game's assets." msgstr "" -#: engines/sci/sci.cpp:403 +#: engines/sci/sci.cpp:404 msgid "" "You have selected General MIDI as a sound device. Sierra has provided after-" "market support for General MIDI for this game in their \"General MIDI Utility" @@ -3618,7 +3618,7 @@ msgid "" "game will sound badly distorted." msgstr "" -#: engines/sci/sci.cpp:422 +#: engines/sci/sci.cpp:423 msgid "" "Your game is patched with a fan made script patch. Such patches have been " "reported to cause issues, as they modify game scripts extensively. The " |