From 724b22e5c7cbd0ebf3f605adff7a08242dba3a13 Mon Sep 17 00:00:00 2001 From: athrxx Date: Mon, 13 Jun 2011 22:35:01 +0200 Subject: SCUMM FM-TOWNS: add number of color check in TownsScreen::updateOutputBuffer() Although the 16 color surface is normally not on bottom, there could (theoretically?) be cases in 8bit fallback mode where this becomes relevant. --- engines/scumm/gfx_towns.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp index 10d6ee0082..cdccd3e193 100644 --- a/engines/scumm/gfx_towns.cpp +++ b/engines/scumm/gfx_towns.cpp @@ -458,7 +458,7 @@ void TownsScreen::updateOutputBuffer() { } for (int y = r->top; y <= r->bottom; ++y) { - if (l->bpp == _bpp && l->scaleW == 1 && l->onBottom) { + if (l->bpp == _bpp && l->scaleW == 1 && l->onBottom && l->numCol & 0xff00) { memcpy(dst, &l->bltInternY[y][l->bltInternX[r->left]], (r->right + 1 - r->left) * _bpp); dst += _pitch; -- cgit v1.2.3 From ba758710f5b4e700d5e18461bd0939876fbf4499 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 13 Jun 2011 22:08:47 +0100 Subject: I18N: Update list of files used to generate translation template This fixes an error due to a file that had been deleted a few weeks ago. --- po/POTFILES | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES b/po/POTFILES index fd70319f07..3d8c268335 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -58,6 +58,5 @@ backends/platform/wince/CEActionsPocket.cpp backends/platform/wince/CEActionsSmartphone.cpp backends/platform/wince/CELauncherDialog.cpp backends/platform/wince/wince-sdl.cpp -backends/events/gp2xsdl/gp2xsdl-events.cpp backends/events/gph/gph-events.cpp backends/events/openpandora/op-events.cpp -- cgit v1.2.3 From 06bbb57ad71103ac34e607c04798efae78a28880 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 13 Jun 2011 22:19:18 +0100 Subject: I18N: Make many more GUI MessageDialog strings translatable --- backends/events/default/default-events.cpp | 5 +++-- backends/platform/iphone/osys_events.cpp | 4 ++-- engines/agos/animation.cpp | 7 +++---- engines/dialogs.cpp | 4 ++-- engines/engine.cpp | 17 +++++++++-------- engines/gob/inter_playtoons.cpp | 3 ++- engines/gob/inter_v2.cpp | 5 +++-- engines/gob/inter_v5.cpp | 4 +++- engines/groovie/script.cpp | 3 ++- engines/kyra/sound_midi.cpp | 5 +++-- engines/m4/m4_menus.cpp | 3 ++- engines/parallaction/saveload.cpp | 19 +++++++++---------- engines/scumm/scumm.cpp | 6 ++++-- engines/sky/compact.cpp | 7 ++++--- engines/sword1/animation.cpp | 10 +++++----- engines/sword1/control.cpp | 12 ++++++------ engines/sword1/logic.cpp | 3 ++- engines/sword2/animation.cpp | 10 +++++----- engines/tinsel/saveload.cpp | 5 +++-- po/POTFILES | 17 +++++++++++++++++ 20 files changed, 89 insertions(+), 60 deletions(-) diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index bb74933596..78072b0021 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -26,6 +26,7 @@ #include "common/system.h" #include "common/config-manager.h" +#include "common/translation.h" #include "backends/events/default/default-events.h" #include "backends/keymapper/keymapper.h" #include "backends/keymapper/remap-dialog.h" @@ -218,7 +219,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { if (ConfMan.getBool("confirm_exit")) { if (g_engine) g_engine->pauseEngine(true); - GUI::MessageDialog alert("Do you really want to return to the Launcher?", "Launcher", "Cancel"); + GUI::MessageDialog alert(_("Do you really want to return to the Launcher?"), _("Launcher"), _("Cancel")); result = _shouldRTL = (alert.runModal() == GUI::kMessageOK); if (g_engine) g_engine->pauseEngine(false); @@ -240,7 +241,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { _confirmExitDialogActive = true; if (g_engine) g_engine->pauseEngine(true); - GUI::MessageDialog alert("Do you really want to quit?", "Quit", "Cancel"); + GUI::MessageDialog alert(_("Do you really want to quit?"), _("Quit"), _("Cancel")); result = _shouldQuit = (alert.runModal() == GUI::kMessageOK); if (g_engine) g_engine->pauseEngine(false); diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp index 6e2a4b7e1e..1ab1db0f27 100644 --- a/backends/platform/iphone/osys_events.cpp +++ b/backends/platform/iphone/osys_events.cpp @@ -335,9 +335,9 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x, const char *dialogMsg; if (_mouseClickAndDragEnabled) { _touchpadModeEnabled = false; - dialogMsg = "Mouse-click-and-drag mode enabled."; + dialogMsg = _("Mouse-click-and-drag mode enabled."); } else - dialogMsg = "Mouse-click-and-drag mode disabled."; + dialogMsg = _("Mouse-click-and-drag mode disabled."); GUI::TimedMessageDialog dialog(dialogMsg, 1500); dialog.runModal(); return false; diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index eb78ca3d9b..d9a585bd05 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -29,6 +29,7 @@ #include "common/file.h" #include "common/system.h" #include "common/textconsole.h" +#include "common/translation.h" #include "graphics/cursorman.h" #include "graphics/palette.h" @@ -540,10 +541,8 @@ MoviePlayer *makeMoviePlayer(AGOSEngine_Feeble *vm, const char *name) { return new MoviePlayerSMK(vm, baseName); } - char buf[60]; - - sprintf(buf, "Cutscene file '%s' not found!", baseName); - GUI::MessageDialog dialog(buf, "OK"); + Common::String buf = Common::String::format(_("Cutscene file '%s' not found!"), baseName); + GUI::MessageDialog dialog(buf, _("OK")); dialog.runModal(); return NULL; diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 3fd8671e55..531cf32dbc 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -143,9 +143,9 @@ void MainMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3 break; case kHelpCmd: { GUI::MessageDialog dialog( - "Sorry, this engine does not currently provide in-game help. " + _("Sorry, this engine does not currently provide in-game help. " "Please consult the README for basic information, and for " - "instructions on how to obtain further assistance."); + "instructions on how to obtain further assistance.")); dialog.runModal(); } break; diff --git a/engines/engine.cpp b/engines/engine.cpp index 210b0b46a3..dc30b4bd0d 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -42,6 +42,7 @@ #include "common/list_intern.h" #include "common/scummsys.h" #include "common/textconsole.h" +#include "common/translation.h" #include "gui/debugger.h" #include "gui/dialog.h" @@ -216,7 +217,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics: // Just show warnings then these occur: #ifdef USE_RGB_COLOR if (gfxError & OSystem::kTransactionFormatNotSupported) { - Common::String message = "Could not initialize color format."; + Common::String message = _("Could not initialize color format."); GUI::MessageDialog dialog(message); dialog.runModal(); @@ -224,7 +225,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics: #endif if (gfxError & OSystem::kTransactionModeSwitchFailed) { - Common::String message = "Could not switch to video mode: '"; + Common::String message = _("Could not switch to video mode: '"); message += ConfMan.get("gfx_mode"); message += "'."; @@ -233,12 +234,12 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics: } if (gfxError & OSystem::kTransactionAspectRatioFailed) { - GUI::MessageDialog dialog("Could not apply aspect ratio setting."); + GUI::MessageDialog dialog(_("Could not apply aspect ratio setting.")); dialog.runModal(); } if (gfxError & OSystem::kTransactionFullscreenFailed) { - GUI::MessageDialog dialog("Could not apply fullscreen setting."); + GUI::MessageDialog dialog(_("Could not apply fullscreen setting.")); dialog.runModal(); } } @@ -338,22 +339,22 @@ void Engine::checkCD() { if (GetDriveType(buffer) == DRIVE_CDROM) { GUI::MessageDialog dialog( - "You appear to be playing this game directly\n" + _("You appear to be playing this game directly\n" "from the CD. This is known to cause problems,\n" "and it is therefore recommended that you copy\n" "the data files to your hard disk instead.\n" - "See the README file for details.", "OK"); + "See the README file for details."), _("OK")); dialog.runModal(); } else { // If we reached here, the game has audio tracks, // it's not ran from the CD and the tracks have not // been ripped. GUI::MessageDialog dialog( - "This game has audio tracks in its disk. These\n" + _("This game has audio tracks in its disk. These\n" "tracks need to be ripped from the disk using\n" "an appropriate CD audio extracting tool in\n" "order to listen to the game's music.\n" - "See the README file for details.", "OK"); + "See the README file for details."), _("OK")); dialog.runModal(); } #endif diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp index d57d2f354b..e05cae354c 100644 --- a/engines/gob/inter_playtoons.cpp +++ b/engines/gob/inter_playtoons.cpp @@ -22,6 +22,7 @@ #include "common/endian.h" #include "common/str.h" +#include "common/translation.h" #include "gui/message.h" @@ -252,7 +253,7 @@ void Inter_Playtoons::oPlaytoons_readData(OpFuncParams ¶ms) { WRITE_VAR(1, 1); if (!_vm->_saveLoad->load(file.c_str(), dataVar, size, offset)) { - GUI::MessageDialog dialog("Failed to load game state from file."); + GUI::MessageDialog dialog(_("Failed to load game state from file.")); dialog.runModal(); } else WRITE_VAR(1, 0); diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 84cae3b380..2fea18343d 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -22,6 +22,7 @@ #include "common/endian.h" #include "common/str.h" +#include "common/translation.h" #include "gui/message.h" @@ -1279,7 +1280,7 @@ void Inter_v2::o2_readData(OpFuncParams ¶ms) { if (!_vm->_saveLoad->load(file, dataVar, size, offset)) { - GUI::MessageDialog dialog("Failed to load game state from file."); + GUI::MessageDialog dialog(_("Failed to load game state from file.")); dialog.runModal(); } else @@ -1349,7 +1350,7 @@ void Inter_v2::o2_writeData(OpFuncParams ¶ms) { if (!_vm->_saveLoad->save(file, dataVar, size, offset)) { - GUI::MessageDialog dialog("Failed to save game state to file."); + GUI::MessageDialog dialog(_("Failed to save game state to file.")); dialog.runModal(); } else diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp index ed371737bd..c0e8978afd 100644 --- a/engines/gob/inter_v5.cpp +++ b/engines/gob/inter_v5.cpp @@ -20,6 +20,8 @@ * */ +#include "common/translation.h" + #include "gui/message.h" #include "gob/gob.h" @@ -102,7 +104,7 @@ void Inter_v5::o5_deleteFile() { if (mode == SaveLoad::kSaveModeSave) { if (!_vm->_saveLoad->deleteFile(file)) { - GUI::MessageDialog dialog("Failed to delete file."); + GUI::MessageDialog dialog(_("Failed to delete file.")); dialog.runModal(); } diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index b52a8723fc..f87e6bb91b 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -36,6 +36,7 @@ #include "common/events.h" #include "common/file.h" #include "common/macresman.h" +#include "common/translation.h" #include "gui/message.h" @@ -413,7 +414,7 @@ void Script::savegame(uint slot) { if (!file) { debugC(9, kGroovieDebugScript, "Save file pointer is null"); - GUI::MessageDialog dialog("Failed to save game", "OK"); + GUI::MessageDialog dialog(_("Failed to save game"), _("OK")); dialog.runModal(); return; } diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp index 6c003d0a11..dc0f8c11ec 100644 --- a/engines/kyra/sound_midi.cpp +++ b/engines/kyra/sound_midi.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "common/config-manager.h" +#include "common/translation.h" #include "gui/message.h" @@ -471,11 +472,11 @@ SoundMidiPC::SoundMidiPC(KyraEngine_v1 *vm, Audio::Mixer *mixer, MidiDriver *dri // (This will only happen in The Legend of Kyrandia 1 though, all other // supported games include special General MIDI tracks). if (_type == kMidiMT32 && !_nativeMT32) { - ::GUI::MessageDialog dialog("You appear to be using a General MIDI device,\n" + ::GUI::MessageDialog dialog(_("You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" "General MIDI ones. After all it might happen\n" - "that a few tracks will not be correctly played."); + "that a few tracks will not be correctly played.")); dialog.runModal(); } } diff --git a/engines/m4/m4_menus.cpp b/engines/m4/m4_menus.cpp index 787d8666f6..3384a82c8b 100644 --- a/engines/m4/m4_menus.cpp +++ b/engines/m4/m4_menus.cpp @@ -22,6 +22,7 @@ #include "common/algorithm.h" // for find() #include "common/textconsole.h" +#include "common/translation.h" #include "gui/dialog.h" #include "gui/message.h" @@ -134,7 +135,7 @@ void OrionCallbacks::saveLoadSaveFn(DialogView *view, MenuObject *item) { bool succeeded = view->vm()->_saveLoad->save(view->_selectedSlot + 1, textItem->getText()); if (!succeeded) { - GUI::MessageDialog dialog("Save game failed!"); + GUI::MessageDialog dialog(_("Save game failed!")); dialog.runModal(); } diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 673c613485..5a1daa256b 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -23,6 +23,7 @@ #include "common/savefile.h" #include "common/config-manager.h" #include "common/textconsole.h" +#include "common/translation.h" #include "gui/dialog.h" #include "gui/saveload.h" @@ -129,8 +130,7 @@ void SaveLoad_ns::doLoadGame(uint16 slot) { void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) { Common::OutSaveFile *f = getOutSaveFile(slot); if (f == 0) { - char buf[32]; - sprintf(buf, "Can't save game in slot %i\n\n", slot); + Common::String buf = Common::String::format(_("Can't save game in slot %i\n\n"), slot); GUI::MessageDialog dialog(buf); dialog.runModal(); return; @@ -208,7 +208,7 @@ bool SaveLoad::loadGame() { doLoadGame(_di); - GUI::TimedMessageDialog dialog("Loading game...", 1500); + GUI::TimedMessageDialog dialog(_("Loading game..."), 1500); dialog.runModal(); return true; @@ -223,7 +223,7 @@ bool SaveLoad::saveGame() { doSaveGame(slot, saveName.c_str()); - GUI::TimedMessageDialog dialog("Saving game...", 1500); + GUI::TimedMessageDialog dialog(_("Saving game..."), 1500); dialog.runModal(); return true; @@ -276,9 +276,9 @@ void SaveLoad_ns::getGamePartProgress(bool *complete, int size) { static bool askRenameOldSavefiles() { GUI::MessageDialog dialog0( - "ScummVM found that you have old savefiles for Nippon Safes that should be renamed.\n" + _("ScummVM found that you have old savefiles for Nippon Safes that should be renamed.\n" "The old names are no longer supported, so you will not be able to load your games if you don't convert them.\n\n" - "Press OK to convert them now, otherwise you will be asked next time.\n", "OK", "Cancel"); + "Press OK to convert them now, otherwise you will be asked next time.\n"), _("OK"), _("Cancel")); return (dialog0.runModal() != 0); } @@ -321,12 +321,11 @@ void SaveLoad_ns::renameOldSavefiles() { return; } - char msg[200]; + Common::String msg; if (success == numOldSaves) { - sprintf(msg, "ScummVM successfully converted all your savefiles."); + msg = _("ScummVM successfully converted all your savefiles."); } else { - sprintf(msg, - "ScummVM printed some warnings in your console window and can't guarantee all your files have been converted.\n\n" + msg = _("ScummVM printed some warnings in your console window and can't guarantee all your files have been converted.\n\n" "Please report to the team."); } diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index dd26e23b4d..51888de574 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1766,8 +1766,10 @@ void ScummEngine::setupMusic(int midi) { if (missingFile) { GUI::MessageDialog dialog( - "Native MIDI support requires the Roland Upgrade from LucasArts,\n" - "but " + fileName + " is missing. Using AdLib instead.", "Ok"); + Common::String::format( + _("Native MIDI support requires the Roland Upgrade from LucasArts,\n" + "but %s is missing. Using AdLib instead."), fileName.c_str()), + _("Ok")); dialog.runModal(); _musicType = MDT_ADLIB; } diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 66ce92f8fc..84609d5500 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" #include "common/file.h" #include "common/textconsole.h" +#include "common/translation.h" #include "sky/compact.h" #include "gui/message.h" #include // for ptrdiff_t @@ -126,8 +127,8 @@ static const uint32 turnTableOffsets[] = { SkyCompact::SkyCompact() { _cptFile = new Common::File(); if (!_cptFile->open("sky.cpt")) { - GUI::MessageDialog dialog("Unable to find \"sky.cpt\" file!\n" - "Please download it from www.scummvm.org", "OK", NULL); + GUI::MessageDialog dialog(_("Unable to find \"sky.cpt\" file!\n" + "Please download it from www.scummvm.org"), _("OK"), NULL); dialog.runModal(); error("Unable to find \"sky.cpt\" file\nPlease download it from www.scummvm.org"); } @@ -137,7 +138,7 @@ SkyCompact::SkyCompact() { error("unknown \"sky.cpt\" version"); if (SKY_CPT_SIZE != _cptFile->size()) { - GUI::MessageDialog dialog("The \"sky.cpt\" file has an incorrect size.\nPlease (re)download it from www.scummvm.org", "OK", NULL); + GUI::MessageDialog dialog(_("The \"sky.cpt\" file has an incorrect size.\nPlease (re)download it from www.scummvm.org"), _("OK"), NULL); dialog.runModal(); error("Incorrect sky.cpt size (%d, expected: %d)", _cptFile->size(), SKY_CPT_SIZE); } diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 7e9d1142be..cb86264eeb 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -24,6 +24,7 @@ #include "common/events.h" #include "common/keyboard.h" #include "common/textconsole.h" +#include "common/translation.h" #include "sword1/sword1.h" #include "sword1/animation.h" #include "sword1/text.h" @@ -324,7 +325,6 @@ uint32 DXADecoderWithSound::getElapsedTime() const { MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system) { Common::String filename; - char buf[60]; Audio::SoundHandle *bgSoundHandle = new Audio::SoundHandle; filename = Common::String::format("%s.smk", sequenceList[id]); @@ -341,7 +341,7 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::M DXADecoderWithSound *dxaDecoder = new DXADecoderWithSound(snd, bgSoundHandle); return new MoviePlayer(vm, textMan, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA); #else - GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK"); + GUI::MessageDialog dialog(_("DXA cutscenes found but ScummVM has been built without zlib support"), _("OK")); dialog.runModal(); return NULL; #endif @@ -351,13 +351,13 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::M filename = Common::String::format("%s.mp2", sequenceList[id]); if (Common::File::exists(filename)) { - GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK"); + GUI::MessageDialog dialog(_("MPEG2 cutscenes are no longer supported"), _("OK")); dialog.runModal(); return NULL; } - sprintf(buf, "Cutscene '%s' not found", sequenceList[id]); - GUI::MessageDialog dialog(buf, "OK"); + Common::String buf = Common::String::format(_("Cutscene '%s' not found"), sequenceList[id]); + GUI::MessageDialog dialog(buf, _("OK")); dialog.runModal(); return NULL; diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 86947db8ae..36d5a24e99 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -27,6 +27,7 @@ #include "common/system.h" #include "common/config-manager.h" #include "common/textconsole.h" +#include "common/translation.h" #include "graphics/palette.h" #include "graphics/thumbnail.h" @@ -859,9 +860,9 @@ void Control::checkForOldSaveGames() { } GUI::MessageDialog dialog0( - "ScummVM found that you have old savefiles for Broken Sword 1 that should be converted.\n" + _("ScummVM found that you have old savefiles for Broken Sword 1 that should be converted.\n" "The old save game format is no longer supported, so you will not be able to load your games if you don't convert them.\n\n" - "Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n", "OK", "Cancel"); + "Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n"), _("OK"), _("Cancel")); int choice = dialog0.runModal(); if (choice == GUI::kMessageCancel) { @@ -1228,11 +1229,10 @@ bool Control::convertSaveGame(uint8 slot, char* desc) { if (testSave) { delete testSave; - char msg[200]; - sprintf(msg, "Target new save game already exists!\n" - "Would you like to keep the old save game (%s) or the new one (%s)?\n", + Common::String msg = Common::String::format(_("Target new save game already exists!\n" + "Would you like to keep the old save game (%s) or the new one (%s)?\n"), oldFileName, newFileName); - GUI::MessageDialog dialog0(msg, "Keep the old one", "Keep the new one"); + GUI::MessageDialog dialog0(msg, _("Keep the old one"), _("Keep the new one")); int choice = dialog0.runModal(); if (choice == GUI::kMessageCancel) { diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index 00f7112c05..5b42c9340e 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -23,6 +23,7 @@ #include "common/endian.h" #include "common/util.h" #include "common/textconsole.h" +#include "common/translation.h" #include "sword1/logic.h" #include "sword1/text.h" @@ -1629,7 +1630,7 @@ int Logic::fnRestartGame(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 int Logic::fnQuitGame(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) { if (SwordEngine::_systemVars.isDemo) { - GUI::MessageDialog dialog("This is the end of the Broken Sword 1 Demo", "OK", NULL); + GUI::MessageDialog dialog(_("This is the end of the Broken Sword 1 Demo"), _("OK"), NULL); dialog.runModal(); Engine::quitGame(); } else diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 11ee4a98fd..133abf165e 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -26,6 +26,7 @@ #include "common/mutex.h" #include "common/system.h" #include "common/textconsole.h" +#include "common/translation.h" #include "sword2/sword2.h" #include "sword2/defs.h" @@ -359,7 +360,6 @@ uint32 DXADecoderWithSound::getElapsedTime() const { MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system) { Common::String filename; - char buf[60]; Audio::SoundHandle *bgSoundHandle = new Audio::SoundHandle; filename = Common::String::format("%s.smk", name); @@ -376,7 +376,7 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s DXADecoderWithSound *dxaDecoder = new DXADecoderWithSound(snd, bgSoundHandle); return new MoviePlayer(vm, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA); #else - GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK"); + GUI::MessageDialog dialog(_("DXA cutscenes found but ScummVM has been built without zlib support"), _("OK")); dialog.runModal(); return NULL; #endif @@ -386,7 +386,7 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s filename = Common::String::format("%s.mp2", name); if (Common::File::exists(filename)) { - GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK"); + GUI::MessageDialog dialog(_("MPEG2 cutscenes are no longer supported"), _("OK")); dialog.runModal(); return NULL; } @@ -394,8 +394,8 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s // The demo tries to play some cutscenes that aren't there, so make those warnings more discreet. // In addition, some of the later re-releases of the game don't have the "eye" Virgin logo movie. if (!vm->_logic->readVar(DEMO) && strcmp(name, "eye") != 0) { - sprintf(buf, "Cutscene '%s' not found", name); - GUI::MessageDialog dialog(buf, "OK"); + Common::String buf = Common::String::format(_("Cutscene '%s' not found"), name); + GUI::MessageDialog dialog(buf, _("OK")); dialog.runModal(); } else warning("Cutscene '%s' not found", name); diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index caaf9a13f8..1244168a21 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -34,6 +34,7 @@ #include "common/serializer.h" #include "common/savefile.h" #include "common/textconsole.h" +#include "common/translation.h" #include "gui/message.h" @@ -464,7 +465,7 @@ static bool DoRestore() { delete f; if (failed) { - GUI::MessageDialog dialog("Failed to load game state from file."); + GUI::MessageDialog dialog(_("Failed to load game state from file.")); dialog.runModal(); } @@ -542,7 +543,7 @@ save_failure: _vm->getSaveFileMan()->removeSavefile(SaveSceneName); SaveSceneName = NULL; // Invalidate save name } - GUI::MessageDialog dialog("Failed to save game state to file."); + GUI::MessageDialog dialog(_("Failed to save game state to file.")); dialog.runModal(); } diff --git a/po/POTFILES b/po/POTFILES index 3d8c268335..323e50e8e4 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -21,6 +21,7 @@ common/util.cpp engines/advancedDetector.cpp engines/dialogs.cpp +engines/engine.cpp engines/scumm/dialogs.cpp engines/scumm/help.cpp engines/scumm/scumm.cpp @@ -30,6 +31,21 @@ engines/mohawk/riven.cpp engines/cruise/menu.cpp engines/sci/engine/kfile.cpp engines/agos/saveload.cpp +engines/agos/animation.cpp +engines/gob/inter_playtoons.cpp +engines/gob/inter_v2.cpp +engines/gob/inter_v5.cpp +engines/groovie/script.cpp +engines/kyra/sound_midi.cpp +engines/m4/m4_menus.cpp +engines/sky/compact.cpp +engines/sword1/animation.cpp +engines/sword1/control.cpp +engines/sword1/logic.cpp +engines/sword1/sword1.cpp +engines/sword2/animation.cpp +engines/tinsel/saveload.cpp +engines/parallaction/saveload.cpp audio/fmopl.cpp audio/mididrv.cpp @@ -58,5 +74,6 @@ backends/platform/wince/CEActionsPocket.cpp backends/platform/wince/CEActionsSmartphone.cpp backends/platform/wince/CELauncherDialog.cpp backends/platform/wince/wince-sdl.cpp +backends/events/default/default-events.cpp backends/events/gph/gph-events.cpp backends/events/openpandora/op-events.cpp -- cgit v1.2.3 From c01141a144e5426288a39dfe0f1c0b3fb9882412 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 13 Jun 2011 22:21:43 +0100 Subject: SCUMM: Change MessageDialog button label for consistency Everywhere else the 'OK' button label is all upper case and here was the only place where it was not (it was 'Ok'). --- engines/scumm/scumm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 51888de574..0a5338374e 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1769,7 +1769,7 @@ void ScummEngine::setupMusic(int midi) { Common::String::format( _("Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead."), fileName.c_str()), - _("Ok")); + _("OK")); dialog.runModal(); _musicType = MDT_ADLIB; } -- cgit v1.2.3 From 2d3a915994d5a48eb87d25897a42d35fced68e90 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 13 Jun 2011 22:39:30 +0100 Subject: I18N: Update translation template file from source code --- po/scummvm.pot | 320 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 265 insertions(+), 55 deletions(-) diff --git a/po/scummvm.pot b/po/scummvm.pot index 5c0f98e3ce..39c80538d8 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,10 @@ msgstr "" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "" @@ -82,7 +85,14 @@ msgstr "" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "" @@ -421,7 +431,7 @@ msgstr "" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "" @@ -434,16 +444,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "" @@ -1075,31 +1085,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1145,12 +1155,19 @@ msgstr "" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1165,6 +1182,40 @@ msgstr "" msgid "~K~eys" msgstr "" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +msgid "Could not switch to video mode: '" +msgstr "" + +#: engines/engine.cpp:237 +msgid "Could not apply aspect ratio setting." +msgstr "" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "" @@ -1232,6 +1283,7 @@ msgstr "" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "" @@ -1696,7 +1748,14 @@ msgstr "" msgid "Fly to lower right" msgstr "" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1704,7 +1763,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1712,7 +1771,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1720,7 +1779,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1755,6 +1814,133 @@ msgstr "" msgid "Restore" msgstr "" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +msgid "Failed to load game state from file." +msgstr "" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +msgid "Failed to save game state to file." +msgstr "" + +#: engines/gob/inter_v5.cpp:107 +msgid "Failed to delete file." +msgstr "" + +#: engines/groovie/script.cpp:417 +msgid "Failed to save game" +msgstr "" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +msgid "Save game failed!" +msgstr "" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +msgid "Loading game..." +msgstr "" + +#: engines/parallaction/saveload.cpp:226 +msgid "Saving game..." +msgstr "" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "" @@ -1763,17 +1949,31 @@ msgstr "" msgid "DOSBox OPL emulator" msgstr "" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 +#, c-format +msgid "" +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1905,6 +2105,14 @@ msgstr "" msgid "Disable power off" msgstr "" +#: backends/platform/iphone/osys_events.cpp:338 +msgid "Mouse-click-and-drag mode enabled." +msgstr "" + +#: backends/platform/iphone/osys_events.cpp:340 +msgid "Mouse-click-and-drag mode disabled." +msgstr "" + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "" @@ -2225,13 +2433,13 @@ msgstr "" msgid "Cursor Right" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr "" @@ -2255,75 +2463,77 @@ msgstr "" msgid "Do you want to perform an automatic scan ?" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +msgid "Do you really want to return to the Launcher?" +msgstr "" + +#: backends/events/default/default-events.cpp:222 +msgid "Launcher" +msgstr "" + +#: backends/events/default/default-events.cpp:244 +msgid "Do you really want to quit?" +msgstr "" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 msgid "Maximum Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 msgid "Minimal Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" -- cgit v1.2.3 From f932a11587ca9abdb100972e3f9db0fc18a08819 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 13 Jun 2011 22:39:59 +0100 Subject: I18N: Update translation files from template --- po/ca_ES.po | 345 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/cs_CZ.po | 354 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- po/da_DA.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/de_DE.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/es_ES.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/fr_FR.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/hu_HU.po | 354 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- po/it_IT.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/nb_NO.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/nn_NO.po | 329 +++++++++++++++++++++++++++++++++++++++++++++---------- po/pl_PL.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/ru_RU.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/se_SE.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/uk_UA.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 15 files changed, 4359 insertions(+), 829 deletions(-) diff --git a/po/ca_ES.po b/po/ca_ES.po index a6c2188e85..ce4c1db140 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2010-09-21 23:12+0100\n" "Last-Translator: Jordi Vilalta Prat \n" "Language-Team: Catalan \n" @@ -45,7 +45,10 @@ msgstr "Amunt" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Cancelˇla" @@ -82,7 +85,14 @@ msgstr "Mapeja" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "D'acord" @@ -428,7 +438,7 @@ msgstr "Carrega partida:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Carrega" @@ -443,16 +453,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sí" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "No" @@ -1109,31 +1119,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Ŕmbar" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1179,12 +1189,19 @@ msgstr "Desa la partida:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Desa" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1199,6 +1216,42 @@ msgstr "~C~ancel msgid "~K~eys" msgstr "~T~ecles" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Mode de vídeo actual:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Correcció de la relació d'aspecte" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~A~nterior" @@ -1272,6 +1325,7 @@ msgstr "Desa la partida:" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Surt" @@ -1750,7 +1804,14 @@ msgstr "" msgid "Fly to lower right" msgstr "" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1761,7 +1822,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1772,7 +1833,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1783,7 +1844,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1818,6 +1879,152 @@ msgstr "Desa la partida:" msgid "Restore" msgstr "Restaura" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"No s'ha pogut carregar l'estat del joc del fitxer:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"No s'ha pogut desar l'estat del joc al fitxer:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"No s'ha pogut desar l'estat del joc al fitxer:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"No s'ha pogut desar l'estat del joc al fitxer:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Desa la partida:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Carrega partida:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Desa la partida:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulador OPL de MAME" @@ -1826,17 +2033,31 @@ msgstr "Emulador OPL de MAME" msgid "DOSBox OPL emulator" msgstr "Emulador OPL DOSBox" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 +#, c-format +msgid "" +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 +#, c-format +msgid "" +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1969,6 +2190,16 @@ msgstr "Alta qualitat d' msgid "Disable power off" msgstr "Desactiva l'apagat automŕtic" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Mode Touchpad activat." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Mode Touchpad desactivat." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Mode Touchpad activat." @@ -2295,13 +2526,13 @@ msgstr "Cursor Esquerra" msgid "Cursor Right" msgstr "Cursor Dreta" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Voleu carregar o desar el joc?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Esteu segur de voler sortir? " @@ -2325,78 +2556,82 @@ msgstr "Pantalla " msgid "Do you want to perform an automatic scan ?" msgstr "Voleu fer una cerca automŕtica?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Realment voleu suprimir aquesta partida?" + +#: backends/events/default/default-events.cpp:222 +msgid "Launcher" +msgstr "" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Vols sortir?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volum" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volum" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 6184e3686b..b87fe54a2f 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-06-07 16:23+0100\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: \n" @@ -49,7 +49,10 @@ msgstr "J #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Zrušit" @@ -86,7 +89,14 @@ msgstr "Mapovat" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -427,7 +437,7 @@ msgstr "Nahr #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Nahrát" @@ -442,16 +452,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ano" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Ne" @@ -1091,20 +1101,20 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Jantarová" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Hra v '%s' se zdá být neznámá." -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Prosím nahlaste následující data týmu ScummVM spolu se jménem" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "hry, kterou jste se pokusili přidat a její verzi/jazyk/atd.:" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" @@ -1113,11 +1123,11 @@ msgstr "" "Bylo zjištěno, že Vaše verze hry používá jméno souboru shodující se s " "variantou %s." -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "Pokud je toto původní a nezměněná verze, ohlaste prosím jakékoli" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "předešle vypsané informace od ScummVM zpátky týmu." @@ -1163,12 +1173,19 @@ msgstr "Ulo #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Uložit" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1183,6 +1200,42 @@ msgstr "~Z~ru msgid "~K~eys" msgstr "~K~lávesy" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Současný režim obrazu:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Povolena korekce poměru stran" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~ředchozí" @@ -1250,6 +1303,7 @@ msgstr "Ulo #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Ukončit" @@ -1714,7 +1768,14 @@ msgstr "Let msgid "Fly to lower right" msgstr "Letět doprava dolů" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1725,7 +1786,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1736,7 +1797,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1747,7 +1808,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1785,6 +1846,152 @@ msgstr "Obnovit hru" msgid "Restore" msgstr "Obnovit" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Nahrání stavu hry selhalo ze souboru:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Uložení stavu hry selhalo do souboru:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Uložení stavu hry selhalo do souboru:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Uložení stavu hry selhalo do souboru:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Uložit hru:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Nahrát hru:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Uložit hru:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL Emulátor" @@ -1793,19 +2000,37 @@ msgstr "MAME OPL Emul msgid "DOSBox OPL emulator" msgstr "DOSBox OPL Emulátor" -#: audio/mididrv.cpp:206 -#, c-format +#: audio/mididrv.cpp:204 +#, fuzzy, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" +"Nelze zjistit zvolené zvukové zařízení '%s'. Podívejte se na záznam pro více " +"informací. Pokus o navrácení na nejbližší dostupné zařízení..." + +#: audio/mididrv.cpp:216 +#, fuzzy, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" "Nelze zjistit zvolené zvukové zařízení '%s'. Podívejte se na záznam pro více " "informací. Pokus o navrácení na nejbližší dostupné zařízení..." -#: audio/mididrv.cpp:246 -#, c-format +#: audio/mididrv.cpp:250 +#, fuzzy, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" +"Nelze zjistit upřednostňované zařízení '%s'. Podívejte se na záznam pro více " +"informací. Pokus o navrácení na nejbližší dostupné zařízení..." + +#: audio/mididrv.cpp:265 +#, fuzzy, c-format +msgid "" +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" "Nelze zjistit upřednostňované zařízení '%s'. Podívejte se na záznam pro více " @@ -1939,6 +2164,16 @@ msgstr "Vysok msgid "Disable power off" msgstr "Zakázat vypnutí" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Touchpad režim zapnut" + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Touchpad režim vypnut" + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad režim zapnut" @@ -2259,13 +2494,13 @@ msgstr " msgid "Cursor Right" msgstr "Šipka Doprava" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Chcete hru nahrát nebo uložit?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Jste si jisti, že chcete odejít ? " @@ -2289,82 +2524,87 @@ msgstr "Displej" msgid "Do you want to perform an automatic scan ?" msgstr "Chcete provést automatické hledání?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Mapovat činnost pravé kliknutí" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Musíte namapovat klávesu pro činnost 'Pravé Kliknutí', abyste tuto hru mohli " "hrát" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Mapovat činnost skrýt panel nástrojů" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Musíte namapovat klávesu pro činnost 'Skrýt Panel nástrojů', abyste tuto hru " "mohli hrát" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Namapovat činnost Přiblížit Nahoru (nepovinné)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Namapovat činnost Přiblížit Dolů (nepovinné)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Nezapomeňte namapovat klávesu k činnosti 'Skrýt Panel Nástrojů, abyste " "viděli celý inventář" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Opravdu chcete tuto uloženou hru vymazat" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Udeřit" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Chcete ukončit?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "'Režim Ťuknutí' Dotykové Obrazovky - Levé Kliknutí" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "'Režim Ťuknutí' Dotykové Obrazovky - Pravé Kliknutí" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "'Režim Ťuknutí' Dotykové Obrazovky - Najetí (Bez Kliknutí)" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 msgid "Maximum Volume" msgstr "Maximální Hlasitost" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "Zvyšuji Hlasitost" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 msgid "Minimal Volume" msgstr "Minimální Hlasitost" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "Snižuji Hlasitost" diff --git a/po/da_DA.po b/po/da_DA.po index 3c5d8c98ef..1d9acf76f5 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-01-08 22:53+0100\n" "Last-Translator: Steffen Nyeland \n" "Language-Team: Steffen Nyeland \n" @@ -45,7 +45,10 @@ msgstr "G #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Fortryd" @@ -82,7 +85,14 @@ msgstr "Kortl #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -425,7 +435,7 @@ msgstr "Indl #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Indlćs" @@ -440,16 +450,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nej" @@ -1096,31 +1106,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules brun" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1166,12 +1176,19 @@ msgstr "Gemmer:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Gem" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1186,6 +1203,42 @@ msgstr "~F~ortryd" msgid "~K~eys" msgstr "~T~aster" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Aktuel videotilstand:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Skift billedformat korrektion" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "Fo~r~rige" @@ -1253,6 +1306,7 @@ msgstr "Gem spil tilstand 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Afslut" @@ -1718,7 +1772,14 @@ msgstr "Flyv til h msgid "Fly to lower right" msgstr "Flyv nederst til hřjre" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1729,7 +1790,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1740,7 +1801,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1751,7 +1812,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1786,6 +1847,152 @@ msgstr "Gendan spil:" msgid "Restore" msgstr "Gendan" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Mislykkedes at hente spil tilstand fra fil:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Mislykkedes at gemme spil tilstand til fil:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Mislykkedes at gemme spil tilstand til fil:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Mislykkedes at gemme spil tilstand til fil:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Gemmer:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Indlćs spil:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Gemmer:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" @@ -1794,17 +2001,31 @@ msgstr "MAME OPL emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1937,6 +2158,16 @@ msgstr "H msgid "Disable power off" msgstr "Deaktiver slukning" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Pegeplade tilstand aktiveret." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Pegeplade tilstand deaktiveret." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Pegeplade tilstand aktiveret." @@ -2264,13 +2495,13 @@ msgstr "Pil til venstre" msgid "Cursor Right" msgstr "Pil til hřjre" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vil du hente eller gemme spillet?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Er du sikker pĺ at du vil afslutte ? " @@ -2294,83 +2525,88 @@ msgstr "Vis" msgid "Do you want to perform an automatic scan ?" msgstr "Vil du udfřre en automatisk skanning ?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Tildel hřjreklikshandling" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du skal tildele en tast til 'Hřjreklik' handlingen for at spille dette spil" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Tildel \"skjul vćrktřjslinje\" handling" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Du skal tildele en tast til 'Skjul vćrktřjslinje' handlingen for at spille " "dette spil" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Tildel Formindsk handling (valgfri)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Tildel Forstřr handling (valgfri)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Glem ikke at tildele en tast til 'Skjul vćrktřjslinje' handling for at se " "hele oversigten" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Vil du virkelig slette denne gemmer?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Slag" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Vil du afslutte?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Lydstyrke" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Lydstyrke" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 79e1d2d0c3..154c529984 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-04-24 12:35+0100\n" "Last-Translator: Simon Sawatzki \n" "Language-Team: Lothar Serra Mari & Simon Sawatzki " @@ -47,7 +47,10 @@ msgstr "Pfad hoch" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Abbrechen" @@ -84,7 +87,14 @@ msgstr "Zuweisen" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -429,7 +439,7 @@ msgstr "Spiel laden:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Laden" @@ -444,16 +454,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nein" @@ -1106,31 +1116,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules-Gelb" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1176,12 +1186,19 @@ msgstr "Speichern:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Speichern" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1196,6 +1213,42 @@ msgstr "~A~bbrechen" msgid "~K~eys" msgstr "~T~asten" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Aktueller Videomodus:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Seitenverhältnis anpassen: an/aus" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~Z~urück" @@ -1263,6 +1316,7 @@ msgstr "Spielstand 1-10 speichern" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Beenden" @@ -1728,7 +1782,14 @@ msgstr "Nach rechts fliegen" msgid "Fly to lower right" msgstr "Nach unten rechts fliegen" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1739,7 +1800,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1750,7 +1811,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1761,7 +1822,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1800,6 +1861,152 @@ msgstr "Spiel laden:" msgid "Restore" msgstr "Laden" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Konnte Spielstand nicht aus folgender Datei laden:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Konnte Spielstand nicht in folgender Datei speichern:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Konnte Spielstand nicht in folgender Datei speichern:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Konnte Spielstand nicht in folgender Datei speichern:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Speichern:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Spiel laden:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Speichern:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME-OPL-Emulator" @@ -1808,17 +2015,31 @@ msgstr "MAME-OPL-Emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox-OPL-Emulator" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1951,6 +2172,16 @@ msgstr "Hohe Audioqualit msgid "Disable power off" msgstr "Stromsparmodus abschalten" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Touchpad-Modus aktiviert." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Touchpad-Modus ausgeschaltet." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad-Modus aktiviert." @@ -2278,13 +2509,13 @@ msgstr "Zeiger nach links" msgid "Cursor Right" msgstr "Zeiger nach rechts" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Möchten Sie ein Spiel laden oder speichern?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Möchten Sie wirklich beenden? " @@ -2308,84 +2539,89 @@ msgstr "Anzeige " msgid "Do you want to perform an automatic scan ?" msgstr "Möchten Sie eine automatische Suche durchführen?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Aktion \"Rechtsklick\" zuweisen" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Sie müssen der Aktion \"Rechtsklick\" eine Taste zuweisen, um dieses Spiel " "spielen zu können." -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Aktion \"Werkzeugleiste verbergen\" zuweisen" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Sie müssen der Aktion \"Werkzeugleiste verbergen\" eine Taste zuweisen, um " "dieses Spiel spielen zu können." -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Aktion \"Herauszoomen\" zuweisen (optional)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Aktion \"Hineinzoomen\" zuweisen (optional)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Vergessen Sie nicht, der Aktion \"Werkzeugleiste verbergen\" eine Taste " "zuzuweisen, um das ganze Inventar sehen zu können." -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Diesen Spielstand wirklich löschen?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Schlage" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Möchten Sie beenden?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Lautstärke" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Lautstärke" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index b19a25a48f..0f76d38917 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-05-08 13:31+0100\n" "Last-Translator: Tomás Maidagan\n" "Language-Team: \n" @@ -45,7 +45,10 @@ msgstr "Arriba" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Cancelar" @@ -82,7 +85,14 @@ msgstr "Asignar" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "Aceptar" @@ -425,7 +435,7 @@ msgstr "Cargar juego:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Cargar" @@ -440,16 +450,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sí" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "No" @@ -1097,31 +1107,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ámbar" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1167,12 +1177,19 @@ msgstr "Guardar partida" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Guardar" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1187,6 +1204,42 @@ msgstr "~C~ancelar" msgid "~K~eys" msgstr "~T~eclas" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Modo de vídeo actual:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Corrección de aspecto" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~A~nterior" @@ -1254,6 +1307,7 @@ msgstr "Guardar partida 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Salir" @@ -1719,7 +1773,14 @@ msgstr "Volar a la derecha" msgid "Fly to lower right" msgstr "Volar abajo y a la derecha" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1730,7 +1791,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1741,7 +1802,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1752,7 +1813,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1790,6 +1851,152 @@ msgstr "Cargar partida:" msgid "Restore" msgstr "Cargar" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Fallo al cargar desde el archivo:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Fallo al guardar en el archivo:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Fallo al guardar en el archivo:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Fallo al guardar en el archivo:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Guardar partida" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Cargar juego:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Guardar partida" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulador OPL de MAME" @@ -1798,17 +2005,31 @@ msgstr "Emulador OPL de MAME" msgid "DOSBox OPL emulator" msgstr "Emulador OPL de DOSBox" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1941,6 +2162,16 @@ msgstr "Sonido de alta calidad (m msgid "Disable power off" msgstr "Desactivar apagado" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Modo Touchpad activado." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Modo Touchpad desactivado." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Modo Touchpad activado." @@ -2268,13 +2499,13 @@ msgstr "Izquierda" msgid "Cursor Right" msgstr "Derecha" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "żQuieres cargar o guardar el juego?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr "żSeguro que quieres salir?" @@ -2298,83 +2529,88 @@ msgstr "Pantalla" msgid "Do you want to perform an automatic scan ?" msgstr "żQuieres realizar una búsqueda automática?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Asignar acción 'Clic derecho'" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Debes asignar una tecla a la acción 'Clic derecho' para jugar a este juego" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Asignar acción 'Ocultar barra de tareas'" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Debes asignar una tecla a la acción 'Ocultar barra de tareas' para jugar a " "este juego" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Asignar acción 'Zoom' (opcional)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Asignar acción 'Disminuir zoom' (opcional)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "No olvides asignar una tecla a la acción 'Ocultar barra de tareas' para ver " "todo el inventario" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "żSeguro que quieres borrar esta partida?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Puńetazo" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "żQuieres salir?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volumen" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volumen" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index a1274a2cf9..1dca127df8 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-05-02 19:50+0100\n" "Last-Translator: Thierry Crozat \n" "Language-Team: French \n" @@ -46,7 +46,10 @@ msgstr "Remonter" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Annuler" @@ -83,7 +86,14 @@ msgstr "Affecter" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -427,7 +437,7 @@ msgstr "Charger le jeu:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Charger" @@ -442,16 +452,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Oui" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Non" @@ -1102,31 +1112,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Ambre" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1172,12 +1182,19 @@ msgstr "Sauvegarde:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Sauver" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1192,6 +1209,42 @@ msgstr "~A~nnuler" msgid "~K~eys" msgstr "~T~ouches" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Mode vidéo actuel" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Changer correction du rapport d'aspect" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~récédent" @@ -1259,6 +1312,7 @@ msgstr " #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Quitter" @@ -1724,7 +1778,14 @@ msgstr "Voler vers la droite" msgid "Fly to lower right" msgstr "Voler vers la bas ŕ droite" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1735,7 +1796,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1746,7 +1807,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1757,7 +1818,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1796,6 +1857,152 @@ msgstr "Charger le jeu:" msgid "Restore" msgstr "Charger" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Échec du chargement de l'état du jeu depuis le fichier:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Échec de l'enregistrement de l'état du jeu dans le fichier:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Échec de l'enregistrement de l'état du jeu dans le fichier:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Échec de l'enregistrement de l'état du jeu dans le fichier:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Sauvegarde:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Charger le jeu:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Sauvegarde:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Émulateur MAME OPL" @@ -1804,17 +2011,31 @@ msgstr " msgid "DOSBox OPL emulator" msgstr "Émulateur DOSBox OPL" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1947,6 +2168,16 @@ msgstr "Audio haute qualit msgid "Disable power off" msgstr "Désactivé l'extinction" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Mode touchpad activé" + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Mode touchpad désactivé" + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Mode touchpad activé" @@ -2274,13 +2505,13 @@ msgstr "Gauche" msgid "Cursor Right" msgstr "Droit" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Voulez-vous charger ou enregistrer le jeu?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr "Voulez-vous vraiment quitter?" @@ -2304,84 +2535,89 @@ msgstr "Affichage" msgid "Do you want to perform an automatic scan ?" msgstr "Voulez-vous exécuter une recherche automatique?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Affecter l'action 'Clic Droit'" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Vous devez affecter une touche ŕ l'action de 'Clic Droit' pour pouvoir jouer " "ŕ ce jeu" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Affecter l'action 'Cacher Bar d'Outils'" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Vous devez affecter une touche ŕ l'action 'Cacher Bar d'Outils' pour pouvoir " "jouer ŕ ce jeu" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Affecter l'action 'Dézoomer' (optionnelle)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Affecter l'action 'Zoomer' (optionnelle)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Noubliez pas d'affecter une touche ŕ l'action 'Cacher Bar d'Outils' pour " "pouvoir voir entičrement l'inventaire" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Voulez-vous vraiment supprimer cette sauvegarde?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Frapper" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Voulez-vous quitter?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volume" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volume" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index d3ee99d0fc..d392369220 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-06-12 07:17+0100\n" "Last-Translator: Gruby \n" "Language-Team: Hungarian\n" @@ -49,7 +49,10 @@ msgstr "Feljebb" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Mégse" @@ -86,7 +89,14 @@ msgstr "Kioszt #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -427,7 +437,7 @@ msgstr "J #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Betöltés" @@ -442,16 +452,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Igen" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nem" @@ -1090,31 +1100,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Sárga" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "A '%s' játék ismeretlennek tűnik." -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Kérlek jelezd a ScummVM csapatnak a következő adatokat, együtt a játék" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "címével és megbízható adataival játékverzió/nyelv(ek)/stb.:" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "A felismert játékverziód a használt fájlnévvel a %s egy változata." -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "Ha ez egy eredeti nem változtatott verzió, kérlek jelezd minden" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "előzőleg kiírt információt a ScummVM csapatnak." @@ -1160,12 +1170,19 @@ msgstr "J #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Mentés" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1180,6 +1197,42 @@ msgstr "M msgid "~K~eys" msgstr "Billentyük" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Jelenlegi videómód:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Méretarány korrekció engedélyezve" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "Előző" @@ -1247,6 +1300,7 @@ msgstr "1-10 J #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Kilépés" @@ -1711,7 +1765,14 @@ msgstr "Jobbra rep msgid "Fly to lower right" msgstr "Jobbra le repülés" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1722,7 +1783,7 @@ msgstr "" "\n" "%s fájlba nem sikerült" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1733,7 +1794,7 @@ msgstr "" "\n" "%s fájlból nem sikerült" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1744,7 +1805,7 @@ msgstr "" "\n" "%s fájlba elkészült" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1782,6 +1843,152 @@ msgstr "J msgid "Restore" msgstr "Visszaállítás" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Játékállás betöltése:\n" +"\n" +"%s fájlból nem sikerült" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Játékállás mentése:\n" +"\n" +"%s fájlba nem sikerült" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Játékállás mentése:\n" +"\n" +"%s fájlba nem sikerült" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Játékállás mentése:\n" +"\n" +"%s fájlba nem sikerült" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Játék mentése:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Játék betöltése:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Játék mentése:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulátor" @@ -1790,19 +1997,37 @@ msgstr "MAME OPL emul msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulátor" -#: audio/mididrv.cpp:206 -#, c-format +#: audio/mididrv.cpp:204 +#, fuzzy, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" +"A '%s' kiválasztott hangeszköz nem elérhető. Bővebb információ a " +"naplófájlban. Következő elérhető eszköz keresése..." + +#: audio/mididrv.cpp:216 +#, fuzzy, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" "A '%s' kiválasztott hangeszköz nem elérhető. Bővebb információ a " "naplófájlban. Következő elérhető eszköz keresése..." -#: audio/mididrv.cpp:246 -#, c-format +#: audio/mididrv.cpp:250 +#, fuzzy, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" +"A '%s' elsődleges hangeszköz nem elérhető. Bővebb információ a naplófájlban. " +"Következő elérhető eszköz keresése..." + +#: audio/mididrv.cpp:265 +#, fuzzy, c-format +msgid "" +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" "A '%s' elsődleges hangeszköz nem elérhető. Bővebb információ a naplófájlban. " @@ -1936,6 +2161,16 @@ msgstr "J msgid "Disable power off" msgstr "Leállítás tiltva" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Touchpad mód engedélyezve." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Touchpad mód letiltva." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad mód engedélyezve." @@ -2256,13 +2491,13 @@ msgstr "Kurzor Bal" msgid "Cursor Right" msgstr "Kurzor Jobb" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Játékállás betöltése vagy mentése?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Biztos hogy ki akarsz lépni ? " @@ -2286,78 +2521,83 @@ msgstr "Kijelz msgid "Do you want to perform an automatic scan ?" msgstr "El akarod kezdeni az automatikus vizsgálatot ?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Jobbkatt művelet gomb" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Válassz egy billentyűt a 'Jobbkatt' művelethez" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Eszköztár rejtés gomb" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Válassz egy billentyűt az 'Eszköztár rejtés' művelethez" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Nagyítás művelet (opcionális)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Kicsinyítés művelet (opcionális)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Ne felejts billentyűt társítani az 'Eszköztár rejtés' művelethez, hogy lásd " "a teljes listát" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Biztos hogy törölni akarod ezt a játékállást?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Megüt" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Ki akarsz lépni ?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "Érintőképernyő 'Tap Mód' - Bal katt" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "Érintőképernyő 'Tap Mód' - Jobb katt" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "Érintőképernyő 'Tap Mód' - Lebegő (Nincs katt)" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 msgid "Maximum Volume" msgstr "Maximum Hangerő" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "Hangerő növelése" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 msgid "Minimal Volume" msgstr "Minimum Hangerő" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "Hangerő csökkentése" diff --git a/po/it_IT.po b/po/it_IT.po index 2d31e1ab6a..24f09e349f 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-04-24 14:46+0100\n" "Last-Translator: Matteo 'Maff' Angelino \n" "Language-Team: Italian\n" @@ -45,7 +45,10 @@ msgstr "Su" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Annulla" @@ -82,7 +85,14 @@ msgstr "Mappa" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -424,7 +434,7 @@ msgstr "Carica gioco:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Carica" @@ -439,16 +449,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sě" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "No" @@ -1098,31 +1108,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ambra" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1168,12 +1178,19 @@ msgstr "Salva gioco:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Salva" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1188,6 +1205,42 @@ msgstr "~A~nnulla" msgid "~K~eys" msgstr "~T~asti" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Modalitŕ video attuale:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Cambia correzione proporzioni" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~recedenti" @@ -1255,6 +1308,7 @@ msgstr "Salva nella posizione 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Esci" @@ -1720,7 +1774,14 @@ msgstr "Vola a destra" msgid "Fly to lower right" msgstr "Vola in basso a destra" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1731,7 +1792,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1742,7 +1803,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1753,7 +1814,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1792,6 +1853,152 @@ msgstr "Ripristina gioco:" msgid "Restore" msgstr "Ripristina" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Impossibile caricare il gioco dal file:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Impossibile salvare il gioco nel file:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Impossibile salvare il gioco nel file:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Impossibile salvare il gioco nel file:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Salva gioco:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Carica gioco:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Salva gioco:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulatore OPL MAME" @@ -1800,17 +2007,31 @@ msgstr "Emulatore OPL MAME" msgid "DOSBox OPL emulator" msgstr "Emulatore OPL DOSBox" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1943,6 +2164,16 @@ msgstr "Audio ad alta qualit msgid "Disable power off" msgstr "Disattiva spegnimento in chiusura" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Modalitŕ touchpad attivata." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Modalitŕ touchpad disattivata." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Modalitŕ touchpad attivata." @@ -2270,13 +2501,13 @@ msgstr "Cursore a sinistra" msgid "Cursor Right" msgstr "Cursore a destra" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vuoi caricare o salvare il gioco?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Sei sicuro di voler uscire? " @@ -2300,82 +2531,87 @@ msgstr "Visualizza " msgid "Do you want to perform an automatic scan ?" msgstr "Vuoi eseguire una scansione automatica?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Mappa l'azione del tasto destro" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Devi mappare un tasto per l'azione \"Tasto destro\" per giocare" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Mappa l'azione nascondi barra degli strumenti" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Devi mappare un tasto per l'azione \"Nascondi barra degli strumenti\" per " "giocare" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Mappa l'azione Zoom Up (opzionale)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Mappa l'azione Zoom Down (opzionale)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Non dimenticare di mappare un tasto per l'azione \"Nascondi barra degli " "strumenti\" per vedere l'intero inventario" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Sei sicuro di voler eliminare questo salvataggio?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Pugno" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Sei sicuro di voler uscire?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volume" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volume" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index fcecbed832..3afebc96d9 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-04-25 22:56+0100\n" "Last-Translator: Einar Johan T. Sřmĺen \n" "Language-Team: somaen \n" @@ -49,7 +49,10 @@ msgstr "G #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Avbryt" @@ -86,7 +89,14 @@ msgstr "Koble" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -429,7 +439,7 @@ msgstr " #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Ĺpne" @@ -444,16 +454,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nei" @@ -1093,31 +1103,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Oransje" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1163,12 +1173,19 @@ msgstr "Lagret spill:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Lagre" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1183,6 +1200,42 @@ msgstr "~A~vbryt" msgid "~K~eys" msgstr "~T~aster" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Nĺvćrende videomodus:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Veksle aspekt-rate korrigering" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~F~orrige" @@ -1250,6 +1303,7 @@ msgstr "Lagre spilltilstand 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Avslutt" @@ -1715,7 +1769,14 @@ msgstr "Fly til h msgid "Fly to lower right" msgstr "Fly til nedre hřyre" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1726,7 +1787,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1737,7 +1798,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1748,7 +1809,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1786,6 +1847,152 @@ msgstr "Gjennopprett spill:" msgid "Restore" msgstr "Gjenopprett" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Klarte ikke ĺpne spilltilstand fra fil:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Klarte ikke lagre spilltilstand til fil:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Klarte ikke lagre spilltilstand til fil:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Klarte ikke lagre spilltilstand til fil:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Lagret spill:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Ĺpne spill:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Lagret spill:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" @@ -1794,17 +2001,31 @@ msgstr "MAME OPL emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1937,6 +2158,16 @@ msgstr "H msgid "Disable power off" msgstr "Deaktiver strřmsparing" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Touchpad-modus aktivert." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Touchpad-modus deaktivert." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad-modus aktivert." @@ -2265,13 +2496,13 @@ msgstr "Peker venstre" msgid "Cursor Right" msgstr "Peker hřyre" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vil du ĺpne eller lagre spillet?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Er du sikker pĺ at du vil avslutte ?" @@ -2295,83 +2526,88 @@ msgstr "Skjerm" msgid "Do you want to perform an automatic scan ?" msgstr "Vil du utfřre et automatisk sřk?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Koble handling til hřyreklikk" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du mĺ koble en tast til handlingen 'Hřyreklikk' for ĺ spille dette spillet" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Koble skjul-verktřylinje-handlingen" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Du mĺ koble en tast til 'Skjul verktřylinje'-handlingen for ĺ spille dette " "spillet" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Koble handlingen Zoom Opp (valgfritt)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Koble handlingen Zoom Ned (valgfritt)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Ikke glem ĺ koble en tast til handlingen 'Skjul verktřylinje' for ĺ se hele " "inventaret" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Vil du virkelig slette dette lagrede spillet?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Slĺ" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Vil du avslutte?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volum" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volum" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 5e1083f93d..9eecf8b6b5 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-04-25 23:07+0100\n" "Last-Translator: Einar Johan T. Sřmĺen \n" "Language-Team: somaen \n" @@ -49,7 +49,10 @@ msgstr "G #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Avbryt" @@ -86,7 +89,14 @@ msgstr "Kople" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -429,7 +439,7 @@ msgstr " #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Ĺpne" @@ -442,16 +452,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nei" @@ -1091,31 +1101,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Raudgul" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1163,12 +1173,19 @@ msgstr "Lagra spel:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Lagre" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1183,6 +1200,42 @@ msgstr "~A~vbryt" msgid "~K~eys" msgstr "~T~astar" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Gjeldende videomodus:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Veksle aspekt-korrigering" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~F~orrige" @@ -1250,6 +1303,7 @@ msgstr "Lagre speltilstand 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Avslutt" @@ -1715,7 +1769,14 @@ msgstr "Fly til h msgid "Fly to lower right" msgstr "Fly til nedre hřgre" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1723,7 +1784,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1731,7 +1792,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1739,7 +1800,7 @@ msgid "" "%s" msgstr "" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1777,6 +1838,137 @@ msgstr "Gjenopprett spel:" msgid "Restore" msgstr "Gjenopprett" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +msgid "Failed to load game state from file." +msgstr "" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +msgid "Failed to save game state to file." +msgstr "" + +#: engines/gob/inter_v5.cpp:107 +msgid "Failed to delete file." +msgstr "" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "Full speltittel:" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Lagra spel:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Ĺpne spel:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Lagra spel:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL emulator" @@ -1785,17 +1977,31 @@ msgstr "MAME OPL emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL emulator" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 +#, c-format +msgid "" +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1928,6 +2134,14 @@ msgstr "" msgid "Disable power off" msgstr "Deaktiver strřmsparing" +#: backends/platform/iphone/osys_events.cpp:338 +msgid "Mouse-click-and-drag mode enabled." +msgstr "" + +#: backends/platform/iphone/osys_events.cpp:340 +msgid "Mouse-click-and-drag mode disabled." +msgstr "" + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "" @@ -2255,13 +2469,13 @@ msgstr "Peikar venstre" msgid "Cursor Right" msgstr "Peikar hřgre" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vil du ĺpne eller lagre spelet?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr "Er du sikker pĺ at du vil avslutte?" @@ -2285,81 +2499,86 @@ msgstr "Skjerm" msgid "Do you want to perform an automatic scan ?" msgstr "Vil du utfřre eit automatisk sřk?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Kople hřgreklikkshandling" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du mĺ kople ein tast til 'Hřgreklikk'-handlinga for ĺ spele dette spelet" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Kople skjul-verktřylinje-handlinga" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Du mĺ kople ein tast til 'Skjul verktřylinje' for ĺ spele dette spelet" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Kople Zoom Opp-handling (valfri)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Kople Zoom Ned-handling (valfri)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Ikkje glřym ĺ kople ein tast til 'Skjul verktřylinje' for ĺ se heile " "inventaret" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Vil du verkeleg slette det lagra spelet?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Slĺ" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Vil du avslutte?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volum" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volum" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 62a49070d1..f591d0065a 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-05-02 12:09+0100\n" "Last-Translator: \n" "Language-Team: Grajpopolsku.pl \n" @@ -49,7 +49,10 @@ msgstr "W g #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Anuluj" @@ -86,7 +89,14 @@ msgstr "Przypisz" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -427,7 +437,7 @@ msgstr "Wczytaj gr #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Wczytaj" @@ -441,16 +451,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Tak" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nie" @@ -1093,31 +1103,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Bursztynowy Hercules" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1163,12 +1173,19 @@ msgstr "Zapis:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Zapisz" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1183,6 +1200,42 @@ msgstr "~A~nuluj" msgid "~K~eys" msgstr "~K~lawisze" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Obecny tryb wideo:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Włącz/wyłącz korekcję formatu obrazu" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~P~oprzedni" @@ -1250,6 +1303,7 @@ msgstr "Zapisz stan gry 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Zakończ" @@ -1715,7 +1769,14 @@ msgstr "Le msgid "Fly to lower right" msgstr "Leć w dół, w prawo" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1726,7 +1787,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1737,7 +1798,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1748,7 +1809,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1786,6 +1847,152 @@ msgstr "Wzn msgid "Restore" msgstr "Wznów" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Nie udało się wczytać stanu gry z pliku:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Nie udało się zapisać stanu gry do pliku:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Nie udało się zapisać stanu gry do pliku:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Nie udało się zapisać stanu gry do pliku:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Zapis:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Wczytaj grę:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Zapis:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulator OPL MAME" @@ -1794,17 +2001,31 @@ msgstr "Emulator OPL MAME" msgid "DOSBox OPL emulator" msgstr "Emulator OPL DOSBox" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1937,6 +2158,16 @@ msgstr "D msgid "Disable power off" msgstr "Nie wyłączaj zasilania" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Tryb touchpada włączony." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Tryb touchpada wyłączony." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Tryb touchpada włączony." @@ -2264,13 +2495,13 @@ msgstr "Kursor w lewo" msgid "Cursor Right" msgstr "Kursor w prawo" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Chcesz wczytać bądź zapisać grę?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Na pewno chcesz wyjść? " @@ -2294,80 +2525,85 @@ msgstr "Obraz " msgid "Do you want to perform an automatic scan ?" msgstr "Wykonać automatyczne skanowanie?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Przypisz działanie PPM" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "Musisz przypisać klawisz do 'PPM', by zagrać w tę grę" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Przypisz chowanie paska narzędzi" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "Musisz przypisać przycisk 'Schowaj pasek narzędzi', by zagrać w tę grę" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Przypisz Przybliżanie (opcjonalne)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Przypisz Oddalenie (opcjonalne)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Nie zapomnij przypisać klawisza 'Ukryj pasek narzędzi', by widzieć cały " "ekwipunek" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Na pewno chcesz skasować ten zapis?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Pięść" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Chcesz wyjść?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Głośność" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Głośność" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 491bc286da..a9a0d1412d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-05-03 19:11-0300\n" "Last-Translator: Saulo Benigno \n" "Language-Team: ScummBR (www.scummbr.com) \n" @@ -49,7 +49,10 @@ msgstr "Acima" #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Cancelar" @@ -86,7 +89,14 @@ msgstr "Mapear" #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -428,7 +438,7 @@ msgstr "Carregar jogo:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Carregar" @@ -443,16 +453,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Sim" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Năo" @@ -1100,31 +1110,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1170,12 +1180,19 @@ msgstr "Salvar jogo:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Salvar" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1190,6 +1207,42 @@ msgstr "~C~ancelar" msgid "~K~eys" msgstr "~T~eclas" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Modo de vídeo atual:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Habilita correçăo de proporçăo" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~A~nterior" @@ -1257,6 +1310,7 @@ msgstr "Salvar estado do jogo 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Sair" @@ -1722,7 +1776,14 @@ msgstr "Voar para direita" msgid "Fly to lower right" msgstr "Voar para direita inferior" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1733,7 +1794,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1744,7 +1805,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1755,7 +1816,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1794,6 +1855,152 @@ msgstr "Restaurar jogo:" msgid "Restore" msgstr "Restaurar" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Falha ao carregar o estado do jogo a partir do arquivo:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Falha ao salvar o estado do jogo para o arquivo:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Falha ao salvar o estado do jogo para o arquivo:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Falha ao salvar o estado do jogo para o arquivo:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Salvar jogo:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Carregar jogo:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Salvar jogo:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "Emulador MAME OPL" @@ -1802,17 +2009,31 @@ msgstr "Emulador MAME OPL" msgid "DOSBox OPL emulator" msgstr "Emulador DOSBox OPL" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1945,6 +2166,16 @@ msgstr "Som de alta qualidade (mais lento) (reiniciar)" msgid "Disable power off" msgstr "Desativar desligamento" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Modo Touchpad ligado." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Modo Touchpad desligado." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Modo Touchpad ligado." @@ -2272,13 +2503,13 @@ msgstr "Cursor para a esquerda" msgid "Cursor Right" msgstr "Cursor para a direita" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vocę deseja carregar ou salvar o jogo?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " Tem certeza de que deseja sair? " @@ -2302,83 +2533,88 @@ msgstr "Tela" msgid "Do you want to perform an automatic scan ?" msgstr "Vocę quer executar uma busca automática?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Mapear açăo \"Clique da Direita\"" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Vocę precisa mapear uma tecla para açăo do \"Clique da Direita\" nesse jogo" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Mapear \"Ocultar barra de ferramentas\"" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Vocę precisa mapear uma tecla para açăo do \"Ocultar barra de ferramentas\" " "nesse jogo" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Mapear Zoom para Cima (opcional)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Mapear Zoom para Baixo (opcional)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Năo se esqueça de mapear uma tecla para \"Ocultar a barra de ferramentas\" " "para ver todo o seu inventário" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Vocę realmente quer excluir este jogo salvo?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Soco" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Vocę deseja sair ?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volume" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volume" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 6755a68f2a..9600a810ea 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2010-06-13 20:55+0300\n" "Last-Translator: Eugene Sandulenko \n" "Language-Team: Russian\n" @@ -47,7 +47,10 @@ msgstr " #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "žâÜŐÝĐ" @@ -84,7 +87,14 @@ msgstr " #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -427,7 +437,7 @@ msgstr " #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "ˇĐÓŕă×Řâě" @@ -442,16 +452,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "´Đ" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "˝Őâ" @@ -1100,31 +1110,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ĎÝâĐŕÝëŮ" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1170,12 +1180,19 @@ msgstr " #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "ÁŢĺŕĐÝŘâě" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1190,6 +1207,42 @@ msgstr " msgid "~K~eys" msgstr "~ş~ŰĐŇŘčŘ" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "ÂŐÚăéŘŮ ŇŘÔŐŢŕŐÖŘÜ:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "żŐŕŐÚŰîçŐÝŘŐ ÚŢŕŕŐÚćŘŘ áŢŢâÝŢčŐÝŘď áâŢŕŢÝ" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~ż~ŕŐÔ" @@ -1257,6 +1310,7 @@ msgstr " #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "˛ëĺŢÔ" @@ -1722,7 +1776,14 @@ msgstr " msgid "Fly to lower right" msgstr "ťŐâŐâě ŇßŕĐŇŢ-ŇÝŘ×" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1733,7 +1794,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1744,7 +1805,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1755,7 +1816,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1793,6 +1854,152 @@ msgstr " msgid "Restore" msgstr "˛ŢááâŇÝŢŇŘâě" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"˝Ő ăÔĐŰŢáě ×ĐÓŕă×Řâě ŘÓŕă Ř× äĐŮŰĐ:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"˝Ő ăÔĐŰŢáě ×ĐßŘáĐâě ŘÓŕă Ň äĐŮŰ:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"˝Ő ăÔĐŰŢáě ×ĐßŘáĐâě ŘÓŕă Ň äĐŮŰ:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"˝Ő ăÔĐŰŢáě ×ĐßŘáĐâě ŘÓŕă Ň äĐŮŰ:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "ÁŢĺŕĐÝŘâě ŘÓŕă:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "ˇĐÓŕă×Řâě ŘÓŕă:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "ÁŢĺŕĐÝŘâě ŘÓŕă:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "ÍÜăŰďâŢŕ MAME OPL" @@ -1801,17 +2008,31 @@ msgstr " msgid "DOSBox OPL emulator" msgstr "ÍÜăŰďâŢŕ DOSBox OPL" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1944,6 +2165,16 @@ msgstr " msgid "Disable power off" msgstr "ˇĐßŕŐâŘâě ŇëÚŰîçŐÝŘŐ" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "ŔŐÖŘÜ âĐçßĐÔĐ ŇÚŰîçŐÝ." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "ŔŐÖŘÜ âĐçßĐÔĐ ŇëÚŰîçŐÝ." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "ŔŐÖŘÜ âĐçßĐÔĐ ŇÚŰîçŐÝ." @@ -2271,13 +2502,13 @@ msgstr " msgid "Cursor Right" msgstr "şăŕáŢŕ ŇßŕĐŇŢ" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "˛ë ĺŢâŘâŐ ×ĐÓŕă×Řâě ŰŘŃŢ áŢĺŕĐÝŘâě ŘÓŕă?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " ˛ë ăŇŐŕŐÝë, çâŢ ĺŢâŘâŐ ŇëŮâŘ? " @@ -2301,80 +2532,85 @@ msgstr " msgid "Do you want to perform an automatic scan ?" msgstr "˛ë ĺŢâŘâŐ ßŕŢŘ×ŇŐáâŘ ĐŇâŢÜĐâŘçŐáÚŘŮ ßŢŘáÚ?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "˝Đ×ÝĐçŘâě ÔŐŮáâŇŘŐ ßŢ ßŕĐŇŢÜă éŐŰçÚă" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "˛ë ÔŢŰÖÝë ÝĐ×ÝĐçŘâě ÚŰĐŇŘčă ÝĐ ÔŐŮáâŇŘŐ 'Right Click' ÔŰď íâŢŮ ŘÓŕë" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "˝Đ×ÝĐçŘâě ÔŐŮáâŇŘŐ 'áßŕďâĐâě ßĐÝŐŰě ŘÝáâŕăÜŐÝâŢŇ'" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "˛ë ÔŢŰÖÝë ÝĐ×ÝĐçŘâě ÚŰĐŇŘčă ÝĐ ÔŐŮâáâŇŘŐ 'Hide toolbar' ÔŰď íâŢŮ ŘÓŕë" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "˝Đ×ÝĐçŘâě ÔŐŮáâŇŘŐ ĂŇŐŰŘçŘâě źĐáčâĐŃ (ÝŐŢŃď×ĐâŐŰěÝŢ)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "˝Đ×ÝĐçŘâě ÔŐŮáâŇŘŐ ĂÜŐÝěčŘâě źĐáčâĐŃ (ÝŐŢŃď×ĐâŐŰěÝŢ)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "˝Ő ×ĐŃăÔěâŐ ÝĐ×ÝĐçŘâě ÚŰĐŇŘčă ÔŰď ÔŐŮáâŇŘď 'Hide Toolbar' çâŢŃë ăŇŘÔŐâě ŇŐáě " "ŘÝŇŐÝâĐŕě Ň ŘÓŕŐ" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "˛ë ÔŐŮáâŇŘâŐŰěÝŢ ĺŢâŘâŐ ăÔĐŰŘâě íâŢ áŢĺŕĐÝŐÝŘŐ?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "ĂÔĐŕ" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "˛ë ĺŢâŘâŐ ŇëŮâŘ?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "łŕŢÜÚŢáâě" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "łŕŢÜÚŢáâě" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/se_SE.po b/po/se_SE.po index 2539c8ece8..ccb12b159f 100644 --- a/po/se_SE.po +++ b/po/se_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-05-02 13:07+0100\n" "Last-Translator: Hampus Flink \n" "Language-Team: \n" @@ -50,7 +50,10 @@ msgstr "Upp #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "Avbryt" @@ -87,7 +90,14 @@ msgstr "St #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -430,7 +440,7 @@ msgstr "Ladda spel:" #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "Ladda" @@ -445,16 +455,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "Ja" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "Nej" @@ -1101,31 +1111,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Herkules bärnsten" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1171,12 +1181,19 @@ msgstr "Spara spelet:" #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "Spara" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1191,6 +1208,42 @@ msgstr "A~v~bryt" msgid "~K~eys" msgstr "~T~angenter" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "Aktivt videoläge:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "Korrektion av bildförhĺllande pĺ/av" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~F~öregĺende" @@ -1258,6 +1311,7 @@ msgstr "Spara speldata 1-10" #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "Avsluta" @@ -1723,7 +1777,14 @@ msgstr "Flyg msgid "Fly to lower right" msgstr "Flyg ĺt nedre höger" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1734,7 +1795,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1745,7 +1806,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1756,7 +1817,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1794,6 +1855,152 @@ msgstr " msgid "Restore" msgstr "Ĺterställ" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"Kunde inte läsa spardata frĺn file:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"Kunde inte skriva spardata till file:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"Kunde inte skriva spardata till file:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"Kunde inte skriva spardata till file:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "Spara spelet:" + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "Ladda spel:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "Spara spelet:" + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "MAME OPL-emulator" @@ -1802,17 +2009,31 @@ msgstr "MAME OPL-emulator" msgid "DOSBox OPL emulator" msgstr "DOSBox OPL-emulator" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1945,6 +2166,16 @@ msgstr "H msgid "Disable power off" msgstr "Inaktivera strömsparning" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "Touchpad-läge aktiverat." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "Touchpad-läge inaktiverat." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "Touchpad-läge aktiverat." @@ -2272,13 +2503,13 @@ msgstr "Pekare v msgid "Cursor Right" msgstr "Pekare höger" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "Vill du ladda eller spara spelet?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr "Är du säker pĺ att du vill avsluta?" @@ -2302,83 +2533,88 @@ msgstr "Sk msgid "Do you want to perform an automatic scan ?" msgstr "Vill du utföra en automatisk scan?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "Ställ in högerklick" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "" "Du mĺste välja en tangent för \"Högerklick\" för att spela det här spelet" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "Ställ in göm verktygsrad" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "Du mĺste välja en tangent för \"Göm verktygsrad\" för att spela det här " "spelet" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "Ställ in Zooma up (valfritt)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "Ställ in Zooma ned (valfritt)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "Glöm inte att välja en tangent för \"Göm verktygsrad\" för att se hela " "inventariet" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "Vill du verkligen radera den här spardatan?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "Slĺ" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "Vill du avsluta?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "Volym" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "Volym" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index 32c7132ff6..dfacf84fa7 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 23:15+0100\n" +"POT-Creation-Date: 2011-06-13 22:20+0100\n" "PO-Revision-Date: 2011-03-26 22:38+0200\n" "Last-Translator: Lubomyr Lisen\n" "Language-Team: Ukrainian\n" @@ -47,7 +47,10 @@ msgstr " #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 #: gui/launcher.cpp:312 gui/massadd.cpp:92 gui/options.cpp:1178 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281 #: backends/platform/wii/options.cpp:48 +#: backends/events/default/default-events.cpp:222 +#: backends/events/default/default-events.cpp:244 msgid "Cancel" msgstr "˛öÔÜöÝĐ" @@ -84,7 +87,14 @@ msgstr " #: gui/KeysDialog.cpp:42 gui/launcher.cpp:313 gui/launcher.cpp:936 #: gui/launcher.cpp:940 gui/massadd.cpp:89 gui/options.cpp:1179 -#: backends/platform/wii/options.cpp:47 +#: engines/engine.cpp:346 engines/engine.cpp:357 engines/scumm/scumm.cpp:1772 +#: engines/agos/animation.cpp:545 engines/groovie/script.cpp:417 +#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:344 engines/sword1/animation.cpp:354 +#: engines/sword1/animation.cpp:360 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:379 +#: engines/sword2/animation.cpp:389 engines/sword2/animation.cpp:398 +#: engines/parallaction/saveload.cpp:281 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:52 msgid "OK" msgstr "OK" @@ -426,7 +436,7 @@ msgstr " #: gui/launcher.cpp:615 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 #: engines/mohawk/riven.cpp:711 engines/cruise/menu.cpp:216 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Load" msgstr "ˇĐŇĐÝâĐÖŘâŘ" @@ -441,16 +451,16 @@ msgstr "" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Yes" msgstr "ÂĐÚ" #: gui/launcher.cpp:724 gui/launcher.cpp:872 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "No" msgstr "˝ö" @@ -1095,31 +1105,31 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ĎÝâĐŕÝŘŮ" -#: engines/advancedDetector.cpp:368 +#: engines/advancedDetector.cpp:323 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:369 +#: engines/advancedDetector.cpp:324 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:371 +#: engines/advancedDetector.cpp:326 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" -#: engines/advancedDetector.cpp:632 +#: engines/advancedDetector.cpp:574 #, c-format msgid "" "Your game version has been detected using filename matching as a variant of %" "s." msgstr "" -#: engines/advancedDetector.cpp:635 +#: engines/advancedDetector.cpp:577 msgid "If this is an original and unmodified version, please report any" msgstr "" -#: engines/advancedDetector.cpp:637 +#: engines/advancedDetector.cpp:579 msgid "information previously printed by ScummVM to the team." msgstr "" @@ -1165,12 +1175,19 @@ msgstr " #: engines/sci/engine/kfile.cpp:575 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Save" msgstr "ˇĐßŘáĐâŘ" +#: engines/dialogs.cpp:146 +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" + #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 msgid "~O~K" @@ -1185,6 +1202,42 @@ msgstr " msgid "~K~eys" msgstr "~ş~ŰĐŇöčö" +#: engines/engine.cpp:220 +msgid "Could not initialize color format." +msgstr "" + +#: engines/engine.cpp:228 +#, fuzzy +msgid "Could not switch to video mode: '" +msgstr "żŢâŢçÝŘŮ ŇöÔŐŢŕŐÖŘÜ:" + +#: engines/engine.cpp:237 +#, fuzzy +msgid "Could not apply aspect ratio setting." +msgstr "şŢŕŐÚćöď áßöŇŇöÔÝŢčŐÝÝď áâŢŕöÝ" + +#: engines/engine.cpp:242 +msgid "Could not apply fullscreen setting." +msgstr "" + +#: engines/engine.cpp:342 +msgid "" +"You appear to be playing this game directly\n" +"from the CD. This is known to cause problems,\n" +"and it is therefore recommended that you copy\n" +"the data files to your hard disk instead.\n" +"See the README file for details." +msgstr "" + +#: engines/engine.cpp:353 +msgid "" +"This game has audio tracks in its disk. These\n" +"tracks need to be ripped from the disk using\n" +"an appropriate CD audio extracting tool in\n" +"order to listen to the game's music.\n" +"See the README file for details." +msgstr "" + #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" msgstr "~ż~ŢßŐŕ" @@ -1252,6 +1305,7 @@ msgstr " #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 #: backends/platform/wince/CEActionsSmartphone.cpp:52 +#: backends/events/default/default-events.cpp:244 msgid "Quit" msgstr "˛ŘĺöÔ" @@ -1717,7 +1771,14 @@ msgstr " msgid "Fly to lower right" msgstr "ťŐâöâŘ ÔŢÝŘ×ă ÝĐßŕĐŇŢ" -#: engines/scumm/scumm.cpp:2250 engines/agos/saveload.cpp:190 +#: engines/scumm/scumm.cpp:1770 +#, c-format +msgid "" +"Native MIDI support requires the Roland Upgrade from LucasArts,\n" +"but %s is missing. Using AdLib instead." +msgstr "" + +#: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1728,7 +1789,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2257 engines/agos/saveload.cpp:155 +#: engines/scumm/scumm.cpp:2263 engines/agos/saveload.cpp:155 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1739,7 +1800,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2269 engines/agos/saveload.cpp:198 +#: engines/scumm/scumm.cpp:2275 engines/agos/saveload.cpp:198 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -1750,7 +1811,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2484 +#: engines/scumm/scumm.cpp:2490 msgid "" "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " @@ -1788,6 +1849,152 @@ msgstr " msgid "Restore" msgstr "˛öÔÝŢŇŘâŘ" +#: engines/agos/animation.cpp:544 +#, c-format +msgid "Cutscene file '%s' not found!" +msgstr "" + +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 +#: engines/tinsel/saveload.cpp:468 +#, fuzzy +msgid "Failed to load game state from file." +msgstr "" +"˝Ő ŇÔĐŰŢáď ×ĐŇĐÝâĐÖŘâŘ áâĐÝ ÓŕŘ × äĐŮŰă:\n" +"\n" +"%s" + +#: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 +#, fuzzy +msgid "Failed to save game state to file." +msgstr "" +"˝Ő ŇÔĐŰŢáď ×ŃŐŕŐÓâŘ áâĐÝ ÓŕŘ ă äĐŮŰ:\n" +"\n" +"%s" + +#: engines/gob/inter_v5.cpp:107 +#, fuzzy +msgid "Failed to delete file." +msgstr "" +"˝Ő ŇÔĐŰŢáď ×ŃŐŕŐÓâŘ áâĐÝ ÓŕŘ ă äĐŮŰ:\n" +"\n" +"%s" + +#: engines/groovie/script.cpp:417 +#, fuzzy +msgid "Failed to save game" +msgstr "" +"˝Ő ŇÔĐŰŢáď ×ŃŐŕŐÓâŘ áâĐÝ ÓŕŘ ă äĐŮŰ:\n" +"\n" +"%s" + +#: engines/kyra/sound_midi.cpp:475 +msgid "" +"You appear to be using a General MIDI device,\n" +"but your game only supports Roland MT32 MIDI.\n" +"We try to map the Roland MT32 instruments to\n" +"General MIDI ones. After all it might happen\n" +"that a few tracks will not be correctly played." +msgstr "" + +#: engines/m4/m4_menus.cpp:138 +#, fuzzy +msgid "Save game failed!" +msgstr "ˇŃŐŕŐÓâŘ Óŕă: " + +#: engines/sky/compact.cpp:130 +msgid "" +"Unable to find \"sky.cpt\" file!\n" +"Please download it from www.scummvm.org" +msgstr "" + +#: engines/sky/compact.cpp:141 +msgid "" +"The \"sky.cpt\" file has an incorrect size.\n" +"Please (re)download it from www.scummvm.org" +msgstr "" + +#: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 +msgid "DXA cutscenes found but ScummVM has been built without zlib support" +msgstr "" + +#: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 +msgid "MPEG2 cutscenes are no longer supported" +msgstr "" + +#: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 +#, c-format +msgid "Cutscene '%s' not found" +msgstr "" + +#: engines/sword1/control.cpp:863 +msgid "" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" +msgstr "" + +#: engines/sword1/control.cpp:1232 +#, c-format +msgid "" +"Target new save game already exists!\n" +"Would you like to keep the old save game (%s) or the new one (%s)?\n" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the old one" +msgstr "" + +#: engines/sword1/control.cpp:1235 +msgid "Keep the new one" +msgstr "" + +#: engines/sword1/logic.cpp:1633 +msgid "This is the end of the Broken Sword 1 Demo" +msgstr "" + +#: engines/parallaction/saveload.cpp:133 +#, c-format +msgid "" +"Can't save game in slot %i\n" +"\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:211 +#, fuzzy +msgid "Loading game..." +msgstr "ˇĐŇĐÝâĐÖŘâŘ Óŕă:" + +#: engines/parallaction/saveload.cpp:226 +#, fuzzy +msgid "Saving game..." +msgstr "ˇŃŐŕŐÓâŘ Óŕă: " + +#: engines/parallaction/saveload.cpp:279 +msgid "" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" +"\n" +"Press OK to convert them now, otherwise you will be asked next time.\n" +msgstr "" + +#: engines/parallaction/saveload.cpp:326 +msgid "ScummVM successfully converted all your savefiles." +msgstr "" + +#: engines/parallaction/saveload.cpp:328 +msgid "" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" +"\n" +"Please report to the team." +msgstr "" + #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" msgstr "ľÜăŰďâŢŕ MAME OPL:" @@ -1796,17 +2003,31 @@ msgstr " msgid "DOSBox OPL emulator" msgstr "ľÜăŰďâŢŕ DOSBox OPL" -#: audio/mididrv.cpp:206 +#: audio/mididrv.cpp:204 #, c-format msgid "" -"Failed to detect the selected audio device '%s'. See log file for more " +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:216 +#, c-format +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -#: audio/mididrv.cpp:246 +#: audio/mididrv.cpp:250 +#, c-format +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected). Attempting to fall back to the next available device..." +msgstr "" + +#: audio/mididrv.cpp:265 #, c-format msgid "" -"Failed to detect the preferred device '%s'. See log file for more " +"The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" @@ -1939,6 +2160,16 @@ msgstr " msgid "Disable power off" msgstr "ˇĐŃŢŕŢÝŘâŘ ŇŘÜÚÝŐÝÝď" +#: backends/platform/iphone/osys_events.cpp:338 +#, fuzzy +msgid "Mouse-click-and-drag mode enabled." +msgstr "ŔŐÖŘÜ âĐçßĐÔă ăŇöÜÚÝŐÝŢ." + +#: backends/platform/iphone/osys_events.cpp:340 +#, fuzzy +msgid "Mouse-click-and-drag mode disabled." +msgstr "ŔŐÖŘÜ âĐçßĐÔă ŇŘÜÚÝŐÝŢ." + #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." msgstr "ŔŐÖŘÜ âĐçßĐÔă ăŇöÜÚÝŐÝŢ." @@ -2266,13 +2497,13 @@ msgstr " msgid "Cursor Right" msgstr "şăŕáŢŕ ÝĐßŕĐŇŢ" -#: backends/platform/wince/CEActionsPocket.cpp:265 +#: backends/platform/wince/CEActionsPocket.cpp:264 #: backends/platform/wince/CEActionsSmartphone.cpp:228 msgid "Do you want to load or save the game?" msgstr "˛Ř ĺŢçŐâŐ ×ĐŇĐÝâĐÖŘâŘ ĐŃŢ ×ŃŐŕŐÓâŘ Óŕă?" -#: backends/platform/wince/CEActionsPocket.cpp:327 -#: backends/platform/wince/CEActionsSmartphone.cpp:284 +#: backends/platform/wince/CEActionsPocket.cpp:314 +#: backends/platform/wince/CEActionsSmartphone.cpp:275 msgid " Are you sure you want to quit ? " msgstr " ˛Ř ăßŐŇÝŐÝö, éŢ ĺŢçŐâŐ ŇŘŮâŘ? " @@ -2296,82 +2527,87 @@ msgstr " msgid "Do you want to perform an automatic scan ?" msgstr "˛Ř ĺŢçŐâŐ ×ÔöŮáÝŘâŘ ĐŇâŢÜĐâŘçÝŘŮ ßŢčăÚ?" -#: backends/platform/wince/wince-sdl.cpp:485 +#: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" msgstr "żŐŕŐßŕŘ×ÝĐçŐÝÝď ßŕĐŇŢÓŢ ÚŰöÚă" -#: backends/platform/wince/wince-sdl.cpp:489 +#: backends/platform/wince/wince-sdl.cpp:491 msgid "You must map a key to the 'Right Click' action to play this game" msgstr "˛Ř ßŢŇŘÝÝö ßŕŘ×ÝĐçŘâŘ ÚÝŢßÚă ÔŢ Ôö÷ 'żŕĐŇŘŮ ÚŰöÚ', éŢŃ ÓŕĐâŘ ă ćî Óŕă" -#: backends/platform/wince/wince-sdl.cpp:498 +#: backends/platform/wince/wince-sdl.cpp:500 msgid "Map hide toolbar action" msgstr "żŐŕŐßŕŘ×ÝĐçŘâŘ Ôöî 'ÁĺŢŇĐâŘ żĐÝŐŰě öÝáâŕ.'" -#: backends/platform/wince/wince-sdl.cpp:502 +#: backends/platform/wince/wince-sdl.cpp:504 msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" "˛Ř ßŢŇŘÝÝö ßŐŕŐßŕŘ×ÝĐçŘâŘ ÚÝŢßÚă ÔŰď Ôö÷ 'ÁĺŢŇĐâŘ żĐÝŐŰě öÝáâŕ.', éŢŃ ÓŕĐâŘ " "Ň ćî Óŕă" -#: backends/platform/wince/wince-sdl.cpp:511 +#: backends/platform/wince/wince-sdl.cpp:513 msgid "Map Zoom Up action (optional)" msgstr "żŐŕŐßŕŘ×ÝĐçŘâŘ Ôöî ˇŃöŰěčŐÝÝď (ÝŐŢŃŢŇď×ÚŢŇŢ)" -#: backends/platform/wince/wince-sdl.cpp:514 +#: backends/platform/wince/wince-sdl.cpp:516 msgid "Map Zoom Down action (optional)" msgstr "żŐŕŐßŕŘ×ÝĐçŘâŘ Ôöî ˇÜŐÝčŐÝÝď (ÝŐŢŃŢŇď×ÚŢŇŢ)" -#: backends/platform/wince/wince-sdl.cpp:522 +#: backends/platform/wince/wince-sdl.cpp:524 msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" "˝Ő ×ĐŃăÔěâŐ ßŐŕŐßŕŘ×ÝĐçŘâŘ ÚÝŢßÚă ÔŰď Ôö÷ 'ÁĺŢŇĐâŘ żĐÝŐŰě öÝáâŕ.' éŢŃ " "ßŢŃĐçŘâŘ ŇŐáě öÝŇŐÝâĐŕ" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:273 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:317 -#: backends/events/gph/gph-events.cpp:367 -#: backends/events/gph/gph-events.cpp:410 -#: backends/events/openpandora/op-events.cpp:78 +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Do you really want to return to the Launcher?" +msgstr "˛Ř ÔöŮáÝŢ ĺŢçŐâŐ ŇŘÔĐŰŘâŘ ćŐ ×ŃŐŕŐÖŐÝÝď?" + +#: backends/events/default/default-events.cpp:222 +#, fuzzy +msgid "Launcher" +msgstr "˛ÔĐŕŘâŘ ÚăŰĐÚŢÜ" + +#: backends/events/default/default-events.cpp:244 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "˛Ř ĺŢçŐâŐ ŇŘŮâŘ?" + +#: backends/events/gph/gph-events.cpp:366 +#: backends/events/gph/gph-events.cpp:409 +#: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Left Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:275 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:319 -#: backends/events/gph/gph-events.cpp:369 -#: backends/events/gph/gph-events.cpp:412 -#: backends/events/openpandora/op-events.cpp:80 +#: backends/events/gph/gph-events.cpp:368 +#: backends/events/gph/gph-events.cpp:411 +#: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Right Click" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:277 -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:321 -#: backends/events/gph/gph-events.cpp:371 -#: backends/events/gph/gph-events.cpp:414 -#: backends/events/openpandora/op-events.cpp:82 +#: backends/events/gph/gph-events.cpp:370 +#: backends/events/gph/gph-events.cpp:413 +#: backends/events/openpandora/op-events.cpp:145 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:297 -#: backends/events/gph/gph-events.cpp:391 +#: backends/events/gph/gph-events.cpp:390 #, fuzzy msgid "Maximum Volume" msgstr "łăçÝöáâě" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:299 -#: backends/events/gph/gph-events.cpp:393 +#: backends/events/gph/gph-events.cpp:392 msgid "Increasing Volume" msgstr "" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:306 -#: backends/events/gph/gph-events.cpp:399 +#: backends/events/gph/gph-events.cpp:398 #, fuzzy msgid "Minimal Volume" msgstr "łăçÝöáâě" -#: backends/events/gp2xsdl/gp2xsdl-events.cpp:308 -#: backends/events/gph/gph-events.cpp:401 +#: backends/events/gph/gph-events.cpp:400 msgid "Decreasing Volume" msgstr "" -- cgit v1.2.3 From 8c485fe2dad12e00848673729b9ec9b24a72118c Mon Sep 17 00:00:00 2001 From: D G Turner Date: Tue, 14 Jun 2011 00:15:50 +0100 Subject: BACKENDS: Improve SDL Mixer Output Format Checks and Reporting. This commit corrects a number of minor issues and adds warnings for when the desired output parameters given to SDL_OpenAudio() don't match the obtained. --- backends/mixer/sdl/sdl-mixer.cpp | 26 +++++++++++++++++++++----- backends/mixer/sdl/sdl-mixer.h | 2 +- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp index 16e7f22db5..f0b0885dd7 100644 --- a/backends/mixer/sdl/sdl-mixer.cpp +++ b/backends/mixer/sdl/sdl-mixer.cpp @@ -61,18 +61,34 @@ void SdlMixerManager::init() { // Get the desired audio specs SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC); + // Needed as SDL_OpenAudio as of SDL-1.2.14 mutates fields in + // "desired" if used directly. + SDL_AudioSpec fmt = desired; + // Start SDL audio with the desired specs - if (SDL_OpenAudio(&desired, &_obtainedRate) != 0) { + if (SDL_OpenAudio(&fmt, &_obtained) != 0) { warning("Could not open audio device: %s", SDL_GetError()); _mixer = new Audio::MixerImpl(g_system, desired.freq); assert(_mixer); _mixer->setReady(false); } else { - debug(1, "Output sample rate: %d Hz", _obtainedRate.freq); + debug(1, "Output sample rate: %d Hz", _obtained.freq); + if (_obtained.freq != desired.freq) + warning("SDL mixer output sample rate: %d differs from desired: %d", _obtained.freq, desired.freq); - _mixer = new Audio::MixerImpl(g_system, _obtainedRate.freq); - assert(_mixer); + debug(1, "Output buffer size: %d samples", _obtained.samples); + if (_obtained.samples != desired.samples) + warning("SDL mixer output buffer size: %d differs from desired: %d", _obtained.samples, desired.samples); + + if (_obtained.format != desired.format) + warning("SDL mixer sound format: %d differs from desired: %d", _obtained.format, desired.format); + + if (_obtained.channels != 2) + error("SDL mixer output requires stereo output device"); + + _mixer = new Audio::MixerImpl(g_system, _obtained.freq); + assert(_mixer); _mixer->setReady(true); startAudio(); @@ -133,7 +149,7 @@ void SdlMixerManager::suspendAudio() { int SdlMixerManager::resumeAudio() { if (!_audioSuspended) return -2; - if (SDL_OpenAudio(&_obtainedRate, NULL) < 0){ + if (SDL_OpenAudio(&_obtained, NULL) < 0){ return -1; } SDL_PauseAudio(0); diff --git a/backends/mixer/sdl/sdl-mixer.h b/backends/mixer/sdl/sdl-mixer.h index 5590c90ab3..82ffa4f901 100644 --- a/backends/mixer/sdl/sdl-mixer.h +++ b/backends/mixer/sdl/sdl-mixer.h @@ -67,7 +67,7 @@ protected: * The obtained audio specification after opening the * audio system. */ - SDL_AudioSpec _obtainedRate; + SDL_AudioSpec _obtained; /** State of the audio system */ bool _audioSuspended; -- cgit v1.2.3 From de96474672cc8c18fe189dda2958c505692f9389 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Tue, 14 Jun 2011 00:48:59 +0100 Subject: BACKENDS: Fix Compilation. --- backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp | 2 +- backends/mixer/symbiansdl/symbiansdl-mixer.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp index 526a01d1bf..001389b1c0 100644 --- a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp +++ b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp @@ -45,7 +45,7 @@ void DoubleBufferSDLMixerManager::startAudio() { // Create two sound buffers _activeSoundBuf = 0; - uint bufSize = _obtainedRate.samples * 4; + uint bufSize = _obtained.samples * 4; _soundBufSize = bufSize; _soundBuffers[0] = (byte *)calloc(1, bufSize); _soundBuffers[1] = (byte *)calloc(1, bufSize); diff --git a/backends/mixer/symbiansdl/symbiansdl-mixer.cpp b/backends/mixer/symbiansdl/symbiansdl-mixer.cpp index b2462a1cdf..c911a99b61 100644 --- a/backends/mixer/symbiansdl/symbiansdl-mixer.cpp +++ b/backends/mixer/symbiansdl/symbiansdl-mixer.cpp @@ -43,8 +43,8 @@ SymbianSdlMixerManager::~SymbianSdlMixerManager() { void SymbianSdlMixerManager::startAudio() { // Need to create mixbuffer for stereo mix to downmix - if (_obtainedRate.channels != 2) { - _stereoMixBuffer = new byte [_obtainedRate.size * 2]; // * 2 for stereo values + if (_obtained.channels != 2) { + _stereoMixBuffer = new byte [_obtained.size * 2]; // * 2 for stereo values } SdlMixerManager::startAudio(); @@ -54,7 +54,7 @@ void SymbianSdlMixerManager::callbackHandler(byte *samples, int len) { assert(_mixer); #if defined (S60) && !defined(S60V3) // If not stereo then we need to downmix - if (_obtainedRate.channels != 2) { + if (_obtained.channels != 2) { _mixer->mixCallback(_stereoMixBuffer, len * 2); int16 *bitmixDst = (int16 *)samples; -- cgit v1.2.3 From 5174832e314b4c63ac2a7fd89c09f48fafc68a69 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 14 Jun 2011 10:35:58 -0400 Subject: MOHAWK: Finish implementation of Riven's storeMovieOpcode opcode --- engines/mohawk/mohawk.h | 7 ++++++- engines/mohawk/riven.cpp | 13 +++++++++++++ engines/mohawk/riven.h | 2 ++ engines/mohawk/riven_scripts.cpp | 26 ++++++++++---------------- engines/mohawk/riven_scripts.h | 4 +++- engines/mohawk/video.cpp | 12 +++++++++++- 6 files changed, 45 insertions(+), 19 deletions(-) diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h index b189f82040..f0618f7374 100644 --- a/engines/mohawk/mohawk.h +++ b/engines/mohawk/mohawk.h @@ -28,6 +28,8 @@ #include "engines/engine.h" +#include "mohawk/video.h" + class OSystem; namespace Common { @@ -76,7 +78,6 @@ struct MohawkGameDescription; class Sound; class PauseDialog; class MohawkArchive; -class VideoManager; class CursorManager; class MohawkEngine : public ::Engine { @@ -112,6 +113,10 @@ public: void pauseGame(); + // Check if events should be done based on a video's current time + // (currently only used for Riven's storeMovieOpcode function) + virtual void doVideoTimer(VideoHandle handle, bool force) {} + private: PauseDialog *_pauseDialog; void pauseEngineIntern(bool); diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 57a0ac717d..3514afdb61 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -833,6 +833,19 @@ void MohawkEngine_Riven::installCardTimer() { } } +void MohawkEngine_Riven::doVideoTimer(VideoHandle handle, bool force) { + assert(handle != NULL_VID_HANDLE); + + uint16 id = _scriptMan->getStoredMovieOpcodeID(); + + if (handle != _video->findVideoHandleRiven(id)) // Check if we've got a video match + return; + + // Run the opcode if we can at this point + if (force || _video->getElapsedTime(handle) >= _scriptMan->getStoredMovieOpcodeTime()) + _scriptMan->runStoredMovieOpcode(); +} + bool ZipMode::operator== (const ZipMode &z) const { return z.name == name && z.id == id; } diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index c80f497e37..c7d36e585d 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -131,6 +131,8 @@ public: typedef void (*TimerProc)(MohawkEngine_Riven *vm); + void doVideoTimer(VideoHandle handle, bool force); + private: MohawkArchive *_extrasFile; // We need a separate handle for the extra data RivenConsole *_console; diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index b3d5369a84..8abce10f3b 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -536,6 +536,10 @@ void RivenScript::fadeAmbientSounds(uint16 op, uint16 argc, uint16 *argv) { // Command 38: Store an opcode for use when playing a movie (movie id, time high, time low, opcode, arguments...) void RivenScript::storeMovieOpcode(uint16 op, uint16 argc, uint16 *argv) { + // This opcode is used to delay an opcode's usage based on the elapsed + // time of a specified movie. However, every use in the game is for + // delaying an activateSLST opcode. + uint32 scriptSize = 6 + (argc - 4) * 2; // Create our dummy script @@ -557,13 +561,11 @@ void RivenScript::storeMovieOpcode(uint16 op, uint16 argc, uint16 *argv) { // Store the script RivenScriptManager::StoredMovieOpcode storedOp; storedOp.script = script; - storedOp.time = delayTime + _vm->getTotalPlayTime(); + storedOp.time = delayTime; storedOp.id = argv[0]; - // TODO: Actually store the movie and call it in our movie loop - // For now, just delete the script and move on - //_vm->_scriptMan->setStoredMovieOpcode(storedOp); - delete script; + // Store the opcode for later + _vm->_scriptMan->setStoredMovieOpcode(storedOp); } else { // Run immediately if we have no delay script->runScript(); @@ -716,18 +718,10 @@ void RivenScriptManager::setStoredMovieOpcode(const StoredMovieOpcode &op) { _storedMovieOpcode.time = op.time; } -void RivenScriptManager::runStoredMovieOpcode(uint16 id) { +void RivenScriptManager::runStoredMovieOpcode() { if (_storedMovieOpcode.script) { - if (_storedMovieOpcode.id == id) { - // If we've passed the time, run our script - if (_vm->getTotalPlayTime() >= _storedMovieOpcode.time) { - _storedMovieOpcode.script->runScript(); - clearStoredMovieOpcode(); - } - } else { - // We're on a completely different video, kill off any remaining opcode - clearStoredMovieOpcode(); - } + _storedMovieOpcode.script->runScript(); + clearStoredMovieOpcode(); } } diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h index 75d4592e55..2932ba5939 100644 --- a/engines/mohawk/riven_scripts.h +++ b/engines/mohawk/riven_scripts.h @@ -141,8 +141,10 @@ public: uint16 id; }; + uint16 getStoredMovieOpcodeID() { return _storedMovieOpcode.id; } + uint32 getStoredMovieOpcodeTime() { return _storedMovieOpcode.time; } void setStoredMovieOpcode(const StoredMovieOpcode &op); - void runStoredMovieOpcode(uint16 id); + void runStoredMovieOpcode(); void clearStoredMovieOpcode(); private: diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index 0a74d058c9..eec6256276 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -133,6 +133,7 @@ void VideoManager::waitUntilMovieEnds(VideoHandle videoHandle) { break; case Common::KEYCODE_ESCAPE: continuePlaying = false; + _vm->doVideoTimer(videoHandle, true); break; default: break; @@ -208,14 +209,20 @@ bool VideoManager::updateMovies() { if (_videoStreams[i].loop) { _videoStreams[i]->seekToTime(_videoStreams[i].start); } else { + // Check the video time one last time before deleting it + _vm->doVideoTimer(i, true); delete _videoStreams[i].video; _videoStreams[i].clear(); continue; } } + // Nothing more to do if we're paused + if (_videoStreams[i]->isPaused()) + continue; + // Check if we need to draw a frame - if (!_videoStreams[i]->isPaused() && _videoStreams[i]->needsUpdate()) { + if (_videoStreams[i]->needsUpdate()) { const Graphics::Surface *frame = _videoStreams[i]->decodeNextFrame(); Graphics::Surface *convertedFrame = 0; @@ -266,6 +273,9 @@ bool VideoManager::updateMovies() { } } } + + // Check the video time + _vm->doVideoTimer(i, false); } // Return true if we need to update the screen -- cgit v1.2.3 From a495632e07e13ab0aaa2251681451393030c00ca Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 14 Jun 2011 10:46:48 -0400 Subject: MOHAWK: Finish implementation of Riven's stopSound() opcode --- engines/mohawk/riven_scripts.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 8abce10f3b..161acb665f 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -407,14 +407,14 @@ void RivenScript::stopSound(uint16 op, uint16 argc, uint16 *argv) { return; // The argument is a bitflag for the setting. - // bit 0 is normal sound stopping (unused) + // bit 0 is normal sound stopping // bit 1 is ambient sound stopping // Having no flags set means clear all if (argv[0] & 2 || argv[0] == 0) _vm->_sound->stopAllSLST(); - if (argv[0] & 1) - warning("Unhandled stopSound() flag"); + if (argv[0] & 1 || argv[0] == 0) + _vm->_sound->stopSound(); } // Command 13: set mouse cursor (cursor_id) -- cgit v1.2.3 From 929e7ba4a50876cd065d4d09347f44f0a62b27e1 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 11 Jun 2011 17:32:58 +0200 Subject: SWORD1: Replace some sprintf uses --- engines/sword1/music.cpp | 21 +++++++-------------- engines/sword1/music.h | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index a291d80f85..265bebb000 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -47,8 +47,7 @@ namespace Sword1 { // These functions are only called from Music, so I'm just going to // assume that if locking is needed it has already been taken care of. -bool MusicHandle::play(const char *fileBase, bool loop) { - char fileName[30]; +bool MusicHandle::play(const Common::String &filename, bool loop) { stop(); // FIXME: How about using AudioStream::openStreamFile instead of the code below? @@ -57,8 +56,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { #ifdef USE_FLAC if (!_audioSource) { - sprintf(fileName, "%s.flac", fileBase); - if (_file.open(fileName)) { + if (_file.open(filename + ".flac")) { _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); if (!_audioSource) _file.close(); @@ -66,8 +64,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { } if (!_audioSource) { - sprintf(fileName, "%s.fla", fileBase); - if (_file.open(fileName)) { + if (_file.open(filename + ".fla")) { _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); if (!_audioSource) _file.close(); @@ -76,8 +73,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { #endif #ifdef USE_VORBIS if (!_audioSource) { - sprintf(fileName, "%s.ogg", fileBase); - if (_file.open(fileName)) { + if (_file.open(filename + ".ogg")) { _audioSource = Audio::makeLoopingAudioStream(Audio::makeVorbisStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); if (!_audioSource) _file.close(); @@ -86,8 +82,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { #endif #ifdef USE_MAD if (!_audioSource) { - sprintf(fileName, "%s.mp3", fileBase); - if (_file.open(fileName)) { + if (_file.open(filename + ".mp3")) { _audioSource = Audio::makeLoopingAudioStream(Audio::makeMP3Stream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); if (!_audioSource) _file.close(); @@ -95,14 +90,12 @@ bool MusicHandle::play(const char *fileBase, bool loop) { } #endif if (!_audioSource) { - sprintf(fileName, "%s.wav", fileBase); - if (_file.open(fileName)) + if (_file.open(filename + ".wav")) _audioSource = Audio::makeLoopingAudioStream(Audio::makeWAVStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); } if (!_audioSource) { - sprintf(fileName, "%s.aif", fileBase); - if (_file.open(fileName)) + if (_file.open(filename + ".aif")) _audioSource = Audio::makeLoopingAudioStream(Audio::makeAIFFStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); } diff --git a/engines/sword1/music.h b/engines/sword1/music.h index 104bc1c536..4207019c13 100644 --- a/engines/sword1/music.h +++ b/engines/sword1/music.h @@ -43,7 +43,7 @@ private: public: MusicHandle() : _fading(0), _audioSource(NULL) {} virtual int readBuffer(int16 *buffer, const int numSamples); - bool play(const char *filename, bool loop); + bool play(const Common::String &filename, bool loop); bool playPSX(uint16 id, bool loop); void stop(); void fadeUp(); -- cgit v1.2.3 From e4a4aa30f743395342a4ce9cbd6bf6f3f81d6172 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 11 Jun 2011 17:37:51 +0200 Subject: SWORD1: Cleanup music stream initialization --- engines/sword1/music.cpp | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 265bebb000..b4656ff89f 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -54,54 +54,58 @@ bool MusicHandle::play(const Common::String &filename, bool loop) { // I.e.: //_audioSource = Audio::AudioStream::openStreamFile(fileBase, 0, 0, loop ? 0 : 1); + Audio::RewindableAudioStream *stream = 0; + #ifdef USE_FLAC - if (!_audioSource) { + if (!stream) { if (_file.open(filename + ".flac")) { - _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); - if (!_audioSource) + stream = Audio::makeFLACStream(&_file, DisposeAfterUse::NO); + if (!stream) _file.close(); } } - if (!_audioSource) { + if (!stream) { if (_file.open(filename + ".fla")) { - _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); - if (!_audioSource) + stream = Audio::makeFLACStream(&_file, DisposeAfterUse::NO); + if (!stream) _file.close(); } } #endif #ifdef USE_VORBIS - if (!_audioSource) { + if (!stream) { if (_file.open(filename + ".ogg")) { - _audioSource = Audio::makeLoopingAudioStream(Audio::makeVorbisStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); - if (!_audioSource) + stream = Audio::makeVorbisStream(&_file, DisposeAfterUse::NO); + if (!stream) _file.close(); } } #endif #ifdef USE_MAD - if (!_audioSource) { + if (!stream) { if (_file.open(filename + ".mp3")) { - _audioSource = Audio::makeLoopingAudioStream(Audio::makeMP3Stream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); - if (!_audioSource) + stream = Audio::makeMP3Stream(&_file, DisposeAfterUse::NO); + if (!stream) _file.close(); } } #endif - if (!_audioSource) { + if (!stream) { if (_file.open(filename + ".wav")) - _audioSource = Audio::makeLoopingAudioStream(Audio::makeWAVStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); + stream = Audio::makeWAVStream(&_file, DisposeAfterUse::NO); } - if (!_audioSource) { + if (!stream) { if (_file.open(filename + ".aif")) - _audioSource = Audio::makeLoopingAudioStream(Audio::makeAIFFStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1); + stream = Audio::makeAIFFStream(&_file, DisposeAfterUse::NO); } - if (!_audioSource) + if (!stream) return false; + _audioSource = Audio::makeLoopingAudioStream(stream, loop ? 0 : 1); + fadeUp(); return true; } @@ -212,12 +216,9 @@ int MusicHandle::readBuffer(int16 *buffer, const int numSamples) { } void MusicHandle::stop() { - if (_audioSource) { - delete _audioSource; - _audioSource = NULL; - } - if (_file.isOpen()) - _file.close(); + delete _audioSource; + _audioSource = NULL; + _file.close(); _fading = 0; } -- cgit v1.2.3 From 7c992d6598743fce09e6666f2c9a0f550ac5e870 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 11 Jun 2011 17:52:32 +0200 Subject: DETECTOR: Merge ADParams into AdvancedMetaEngine --- engines/advancedDetector.cpp | 89 +++++++++++++++++++------------------- engines/advancedDetector.h | 76 ++++++++++++++------------------ engines/agi/detection.cpp | 4 +- engines/agos/detection.cpp | 8 ++-- engines/cine/detection.cpp | 6 +-- engines/cruise/detection.cpp | 4 +- engines/draci/detection.cpp | 2 +- engines/drascula/detection.cpp | 4 +- engines/gob/detection.cpp | 8 ++-- engines/groovie/detection.cpp | 6 +-- engines/kyra/detection.cpp | 6 +-- engines/lastexpress/detection.cpp | 4 +- engines/lure/detection.cpp | 8 ++-- engines/m4/detection.cpp | 8 ++-- engines/made/detection.cpp | 2 +- engines/mohawk/detection.cpp | 8 ++-- engines/parallaction/detection.cpp | 2 +- engines/saga/detection.cpp | 4 +- engines/sci/detection.cpp | 2 +- engines/sword25/detection.cpp | 6 +-- engines/teenagent/detection.cpp | 2 +- engines/testbed/detection.cpp | 4 +- engines/tinsel/detection.cpp | 10 +---- engines/toon/detection.cpp | 8 ++-- engines/touche/detection.cpp | 12 ++--- engines/tsage/detection.cpp | 6 +-- engines/tucker/detection.cpp | 4 +- 27 files changed, 143 insertions(+), 160 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index b0a304aad9..5a4c493bf7 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -34,12 +34,12 @@ #include "engines/advancedDetector.h" void AdvancedMetaEngine::upgradeTargetIfNecessary() const { - if (params.obsoleteList == 0) + if (_obsoleteList == 0) return; Common::String gameid = ConfMan.get("gameid"); - for (const ADObsoleteGameID *o = params.obsoleteList; o->from; ++o) { + for (const ADObsoleteGameID *o = _obsoleteList; o->from; ++o) { if (gameid.equalsIgnoreCase(o->from)) { gameid = o->to; ConfMan.set("gameid", gameid); @@ -65,11 +65,11 @@ namespace AdvancedDetector { GameDescriptor findGameID( const char *gameid, - const PlainGameDescriptor *gameDescriptors, + const PlainGameDescriptor *gameids, const ADObsoleteGameID *obsoleteList ) { // First search the list of supported gameids for a match. - const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, gameDescriptors); + const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, gameids); if (g) return GameDescriptor(*g); @@ -79,7 +79,7 @@ GameDescriptor findGameID( const ADObsoleteGameID *o = obsoleteList; while (o->from) { if (0 == scumm_stricmp(gameid, o->from)) { - g = findPlainGameDescriptor(o->to, gameDescriptors); + g = findPlainGameDescriptor(o->to, gameids); if (g && g->description) return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")"); else @@ -146,9 +146,9 @@ static Common::String generatePreferredTarget(const Common::String &id, const AD } void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const { - if (params.singleid != NULL) { + if (_singleid != NULL) { desc["preferredtarget"] = desc["gameid"]; - desc["gameid"] = params.singleid; + desc["gameid"] = _singleid; } if (!desc.contains("preferredtarget")) @@ -156,10 +156,10 @@ void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGame desc["preferredtarget"] = generatePreferredTarget(desc["preferredtarget"], realDesc); - if (params.flags & kADFlagUseExtraAsHint) + if (_flags & kADFlagUseExtraAsHint) desc["extra"] = realDesc->extra; - desc.setGUIOptions(realDesc->guioptions | params.guioptions); + desc.setGUIOptions(realDesc->guioptions | _guioptions); desc.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(realDesc->language)); if (realDesc->flags & ADGF_ADDENGLISH) @@ -200,14 +200,14 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { // Use fallback detector if there were no matches by other means const ADGameDescription *fallbackDesc = fallbackDetect(fslist); if (fallbackDesc != 0) { - GameDescriptor desc(toGameDescriptor(*fallbackDesc, params.gameDescriptors)); + GameDescriptor desc(toGameDescriptor(*fallbackDesc, _gameids)); updateGameDescriptor(desc, fallbackDesc); detectedGames.push_back(desc); } } else { // Otherwise use the found matches for (uint i = 0; i < matches.size(); i++) { - GameDescriptor desc(toGameDescriptor(*matches[i], params.gameDescriptors)); + GameDescriptor desc(toGameDescriptor(*matches[i], _gameids)); updateGameDescriptor(desc, matches[i]); detectedGames.push_back(desc); } @@ -229,7 +229,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) language = Common::parseLanguage(ConfMan.get("language")); if (ConfMan.hasKey("platform")) platform = Common::parsePlatform(ConfMan.get("platform")); - if (params.flags & kADFlagUseExtraAsHint) + if (_flags & kADFlagUseExtraAsHint) if (ConfMan.hasKey("extra")) extra = ConfMan.get("extra"); @@ -266,7 +266,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (cleanupPirated(matches)) return Common::kNoGameDataFoundError; - if (params.singleid == NULL) { + if (_singleid == NULL) { for (uint i = 0; i < matches.size(); i++) { if (matches[i]->gameid == gameid) { agdDesc = matches[i]; @@ -283,7 +283,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (agdDesc != 0) { // Seems we found a fallback match. But first perform a basic // sanity check: the gameid must match. - if (params.singleid == NULL && agdDesc->gameid != gameid) + if (_singleid == NULL && agdDesc->gameid != gameid) agdDesc = 0; } } @@ -297,10 +297,10 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (agdDesc->flags & ADGF_ADDENGLISH) lang += " " + getGameGUIOptionsDescriptionLanguage(Common::EN_ANY); - Common::updateGameGUIOptions(agdDesc->guioptions | params.guioptions, lang); + Common::updateGameGUIOptions(agdDesc->guioptions | _guioptions, lang); - debug(2, "Running %s", toGameDescriptor(*agdDesc, params.gameDescriptors).description().c_str()); + debug(2, "Running %s", toGameDescriptor(*agdDesc, _gameids).description().c_str()); if (!createInstance(syst, engine, agdDesc)) return Common::kNoGameDataFoundError; else @@ -345,11 +345,11 @@ void AdvancedMetaEngine::composeFileHashMap(const Common::FSList &fslist, FileMa if (file->isDirectory()) { Common::FSList files; - if (!params.directoryGlobs) + if (!_directoryGlobs) continue; bool matched = false; - for (const char * const *glob = params.directoryGlobs; *glob; glob++) + for (const char * const *glob = _directoryGlobs; *glob; glob++) if (file->getName().matchString(*glob, true)) { matched = true; break; @@ -388,11 +388,11 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm debug(3, "Starting detection in dir '%s'", parent.getPath().c_str()); // First we compose a hashmap of all files in fslist. - composeFileHashMap(fslist, allFiles, (params.depth == 0 ? 1 : params.depth)); + composeFileHashMap(fslist, allFiles, (_maxScanDepth == 0 ? 1 : _maxScanDepth)); // Check which files are included in some ADGameDescription *and* present // in fslist. Compute MD5s and file sizes for these files. - for (descPtr = params.descs; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += params.descItemSize) { + for (descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += _descItemSize) { g = (const ADGameDescription *)descPtr; for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) { @@ -409,7 +409,7 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm Common::MacResManager macResMan; if (macResMan.open(parent, fname)) { - tmp.md5 = macResMan.computeResForkMD5AsString(params.md5Bytes); + tmp.md5 = macResMan.computeResForkMD5AsString(_md5Bytes); tmp.size = macResMan.getResForkDataSize(); debug(3, "> '%s': '%s'", fname.c_str(), tmp.md5.c_str()); filesSizeMD5[fname] = tmp; @@ -422,7 +422,7 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm if (testFile.open(allFiles[fname])) { tmp.size = (int32)testFile.size(); - tmp.md5 = Common::computeStreamMD5AsString(testFile, params.md5Bytes); + tmp.md5 = Common::computeStreamMD5AsString(testFile, _md5Bytes); } else { tmp.size = -1; } @@ -440,7 +440,7 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm // MD5 based matching uint i; - for (i = 0, descPtr = params.descs; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += params.descItemSize, ++i) { + for (i = 0, descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += _descItemSize, ++i) { g = (const ADGameDescription *)descPtr; bool fileMissing = false; @@ -452,7 +452,7 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm continue; } - if ((params.flags & kADFlagUseExtraAsHint) && !extra.empty() && g->extra != extra) + if ((_flags & kADFlagUseExtraAsHint) && !extra.empty() && g->extra != extra) continue; bool allFilesPresent = true; @@ -525,7 +525,7 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm } // Filename based fallback - if (params.fileBasedFallback != 0) + if (_fileBasedFallback != 0) matched = detectGameFilebased(allFiles); } @@ -539,7 +539,7 @@ ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) int maxNumMatchedFiles = 0; const ADGameDescription *matchedDesc = 0; - for (ptr = params.fileBasedFallback; ptr->desc; ++ptr) { + for (ptr = _fileBasedFallback; ptr->desc; ++ptr) { const ADGameDescription *agdesc = (const ADGameDescription *)ptr->desc; int numMatchedFiles = 0; bool fileMissing = false; @@ -570,7 +570,7 @@ ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) if (matchedDesc) { // We got a match matched.push_back(matchedDesc); - if (params.flags & kADFlagPrintWarningOnFileBasedFallback) { + if (_flags & kADFlagPrintWarningOnFileBasedFallback) { Common::String report = Common::String::format(_("Your game version has been detected using " "filename matching as a variant of %s."), matchedDesc->gameid); report += "\n"; @@ -586,38 +586,37 @@ ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) } GameList AdvancedMetaEngine::getSupportedGames() const { - if (params.singleid != NULL) { + if (_singleid != NULL) { GameList gl; - const PlainGameDescriptor *g = params.gameDescriptors; + const PlainGameDescriptor *g = _gameids; while (g->gameid) { - if (0 == scumm_stricmp(params.singleid, g->gameid)) { + if (0 == scumm_stricmp(_singleid, g->gameid)) { gl.push_back(GameDescriptor(g->gameid, g->description)); return gl; } g++; } - error("Engine %s doesn't have its singleid specified in ids list", params.singleid); + error("Engine %s doesn't have its singleid specified in ids list", _singleid); } - return GameList(params.gameDescriptors); + return GameList(_gameids); } GameDescriptor AdvancedMetaEngine::findGame(const char *gameid) const { - return AdvancedDetector::findGameID(gameid, params.gameDescriptors, params.obsoleteList); + return AdvancedDetector::findGameID(gameid, _gameids, _obsoleteList); } -AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameDescriptors) { - params.descs = (const byte *)descs; - params.descItemSize = descItemSize; - params.md5Bytes = 5000; - params.gameDescriptors = gameDescriptors; - params.obsoleteList = NULL; - params.singleid = NULL; - params.fileBasedFallback = NULL; - params.flags = 0; - params.guioptions = Common::GUIO_NONE; - params.depth = 1; - params.directoryGlobs = NULL; +AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameids) + : _gameDescriptors((const byte *)descs), _descItemSize(descItemSize), _gameids(gameids) { + + _md5Bytes = 5000; + _obsoleteList = NULL; + _singleid = NULL; + _fileBasedFallback = NULL; + _flags = 0; + _guioptions = Common::GUIO_NONE; + _maxScanDepth = 1; + _directoryGlobs = NULL; } diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index e5922bea4a..8eb215ef18 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -118,26 +118,40 @@ enum ADFlags { kADFlagUseExtraAsHint = (1 << 2) }; + +namespace AdvancedDetector { + /** - * A structure containing all parameters for the AdvancedDetector. - * Typically, an engine will have a single instance of this which is - * used by its AdvancedMetaEngine subclass as a parameter to the - * primary AdvancedMetaEngine constructor. + * Scan through the game descriptors specified in params and search for + * 'gameid' in there. If a match is found, returns a GameDescriptor + * with gameid and description set. */ -struct ADParams { +GameDescriptor findGameID( + const char *gameid, + const PlainGameDescriptor *gameids, + const ADObsoleteGameID *obsoleteList = 0 + ); + +} // End of namespace AdvancedDetector + +/** + * A MetaEngine implementation based around the advanced detector code. + */ +class AdvancedMetaEngine : public MetaEngine { +protected: /** * Pointer to an array of objects which are either ADGameDescription * or superset structures (i.e. start with an ADGameDescription member. * The list is terminated by an entry with a gameid equal to 0 * (see AD_TABLE_END_MARKER). */ - const byte *descs; + const byte *_gameDescriptors; /** * The size of a single entry of the above descs array. Always * must be >= sizeof(ADGameDescription). */ - uint descItemSize; + uint _descItemSize; /** * The number of bytes to compute MD5 sum for. The AdvancedDetector @@ -147,27 +161,27 @@ struct ADParams { * Typically this will be set to something between 5 and 50 kilobyte, * but arbitrary non-zero values are possible. */ - uint md5Bytes; + uint _md5Bytes; /** * A list of all gameids (and their corresponding descriptions) supported * by this engine. */ - const PlainGameDescriptor *gameDescriptors; + const PlainGameDescriptor *_gameids; /** * Structure for autoupgrading obsolete targets (optional). * * @todo Properly explain this. */ - const ADObsoleteGameID *obsoleteList; + const ADObsoleteGameID *_obsoleteList; /** * Name of single gameid (optional). * * @todo Properly explain this -- what does it do? */ - const char *singleid; + const char *_singleid; /** * List of files for file-based fallback detection (optional). @@ -177,63 +191,39 @@ struct ADParams { * * @todo Properly explain this */ - const ADFileBasedFallback *fileBasedFallback; + const ADFileBasedFallback *_fileBasedFallback; /** * A bitmask of flags which can be used to configure the behavior * of the AdvancedDetector. Refer to ADFlags for a list of flags * that can be ORed together and passed here. */ - uint32 flags; + uint32 _flags; /** * A bitmask of game GUI options which will be added to each * entry in addition to per-game options. Refer to GameGUIOption * enum for the list. */ - uint32 guioptions; + uint32 _guioptions; /** - * Maximum depth of directories to look up + * Maximum depth of directories to look up. * If set to 0, the depth is 1 level */ - uint32 depth; + uint32 _maxScanDepth; /** * Case-insensitive list of directory globs which could be used for - * going deeper int directory structure. + * going deeper into the directory structure. * @see String::matchString() method for format description. * * @note Last item must be 0 */ - const char * const *directoryGlobs; -}; + const char * const *_directoryGlobs; - -namespace AdvancedDetector { - -/** - * Scan through the game descriptors specified in params and search for - * 'gameid' in there. If a match is found, returns a GameDescriptor - * with gameid and description set. - */ -GameDescriptor findGameID( - const char *gameid, - const PlainGameDescriptor *gameDescriptors, - const ADObsoleteGameID *obsoleteList = 0 - ); - -} // End of namespace AdvancedDetector - -/** - * A MetaEngine implementation based around the advanced detector code. - */ -class AdvancedMetaEngine : public MetaEngine { -protected: - ADParams params; public: - AdvancedMetaEngine(const ADParams &dp) : params(dp) {} - AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameDescriptors); + AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameids); /** * Returns list of targets supported by the engine. diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index b0e055edcc..427ffef1ad 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -137,8 +137,8 @@ class AgiMetaEngine : public AdvancedMetaEngine { public: AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames) { - params.singleid = "agi"; - params.guioptions = Common::GUIO_NOSPEECH; + _singleid = "agi"; + _guioptions = Common::GUIO_NOSPEECH; } virtual const char *getName() const { diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index dbd1743304..06606e71b3 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -92,10 +92,10 @@ using namespace AGOS; class AgosMetaEngine : public AdvancedMetaEngine { public: AgosMetaEngine() : AdvancedMetaEngine(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { - params.obsoleteList = obsoleteGameIDsTable; - params.guioptions = Common::GUIO_NOLAUNCHLOAD; - params.depth = 2; - params.directoryGlobs = directoryGlobs; + _obsoleteList = obsoleteGameIDsTable; + _guioptions = Common::GUIO_NOLAUNCHLOAD; + _maxScanDepth = 2; + _directoryGlobs = directoryGlobs; } virtual const char *getName() const { diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 89c81c2599..691acea2b3 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -63,9 +63,9 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { class CineMetaEngine : public AdvancedMetaEngine { public: CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames) { - params.obsoleteList = obsoleteGameIDsTable; - params.singleid = "cine"; - params.guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; + _obsoleteList = obsoleteGameIDsTable; + _singleid = "cine"; + _guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; } virtual const char *getName() const { diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index f6f8db4f3a..5be2fdeeea 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -220,8 +220,8 @@ static const CRUISEGameDescription gameDescriptions[] = { class CruiseMetaEngine : public AdvancedMetaEngine { public: CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { - params.singleid = "cruise"; - params.guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; + _singleid = "cruise"; + _guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; } virtual const char *getName() const { diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index cf0413ffa9..b7e83e1edb 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -86,7 +86,7 @@ const ADGameDescription gameDescriptions[] = { class DraciMetaEngine : public AdvancedMetaEngine { public: DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { - params.singleid = "draci"; + _singleid = "draci"; } virtual const char *getName() const { diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 9494bfa66b..2249a49e4d 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -269,8 +269,8 @@ static const DrasculaGameDescription gameDescriptions[] = { class DrasculaMetaEngine : public AdvancedMetaEngine { public: DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { - params.singleid = "drascula"; - params.guioptions = Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD; + _singleid = "drascula"; + _guioptions = Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD; } virtual const char *getName() const { diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 2ecd6b741e..e30380a5a5 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -89,10 +89,10 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { class GobMetaEngine : public AdvancedMetaEngine { public: GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { - params.obsoleteList = obsoleteGameIDsTable; - params.singleid = "gob"; - params.fileBasedFallback = Gob::fileBased; - params.guioptions = Common::GUIO_NOLAUNCHLOAD; + _obsoleteList = obsoleteGameIDsTable; + _singleid = "gob"; + _fileBasedFallback = Gob::fileBased; + _guioptions = Common::GUIO_NOLAUNCHLOAD; } virtual const char *getName() const { diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index 62ee65d74a..cb0f2296fb 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -205,9 +205,9 @@ static const GroovieGameDescription gameDescriptions[] = { class GroovieMetaEngine : public AdvancedMetaEngine { public: GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames) { - params.singleid = "groovie"; - params.flags = kADFlagUseExtraAsHint; - params.guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; + _singleid = "groovie"; + _flags = kADFlagUseExtraAsHint; + _guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; } const char *getName() const { diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 6589c2b45b..a6af584fb8 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -52,9 +52,9 @@ const char * const directoryGlobs[] = { class KyraMetaEngine : public AdvancedMetaEngine { public: KyraMetaEngine() : AdvancedMetaEngine(adGameDescs, sizeof(KYRAGameDescription), gameList) { - params.md5Bytes = 1024 * 1024; - params.depth = 2; - params.directoryGlobs = directoryGlobs; + _md5Bytes = 1024 * 1024; + _maxScanDepth = 2; + _directoryGlobs = directoryGlobs; } const char *getName() const { return "Kyra"; diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index bf575b63f8..369d815543 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -181,8 +181,8 @@ static const ADGameDescription gameDescriptions[] = { class LastExpressMetaEngine : public AdvancedMetaEngine { public: LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { - params.singleid = "lastexpress"; - params.guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; + _singleid = "lastexpress"; + _guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; } const char *getName() const { diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 83ede92569..397d965396 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -178,10 +178,10 @@ static const LureGameDescription gameDescriptions[] = { class LureMetaEngine : public AdvancedMetaEngine { public: LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) { - params.md5Bytes = 1024; - params.singleid = "lure"; - params.flags = kADFlagUseExtraAsHint; - params.guioptions = Common::GUIO_NOSPEECH; + _md5Bytes = 1024; + _singleid = "lure"; + _flags = kADFlagUseExtraAsHint; + _guioptions = Common::GUIO_NOSPEECH; } virtual const char *getName() const { diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp index bab17d9e1d..02ed967777 100644 --- a/engines/m4/detection.cpp +++ b/engines/m4/detection.cpp @@ -387,10 +387,10 @@ static const char *directoryGlobs[] = { class M4MetaEngine : public AdvancedMetaEngine { public: M4MetaEngine() : AdvancedMetaEngine(M4::gameDescriptions, sizeof(M4::M4GameDescription), m4Games) { - params.singleid = "m4"; - params.guioptions = Common::GUIO_NOMIDI; - params.depth = 2; - params.directoryGlobs = directoryGlobs; + _singleid = "m4"; + _guioptions = Common::GUIO_NOMIDI; + _maxScanDepth = 2; + _directoryGlobs = directoryGlobs; } virtual const char *getName() const { diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index a0576a458e..fcbee9cb32 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -528,7 +528,7 @@ static MadeGameDescription g_fallbackDesc = { class MadeMetaEngine : public AdvancedMetaEngine { public: MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { - params.singleid = "made"; + _singleid = "made"; } virtual const char *getName() const { diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index a7442729d2..e6f60e3cb5 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -161,10 +161,10 @@ static const char *directoryGlobs[] = { class MohawkMetaEngine : public AdvancedMetaEngine { public: MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) { - params.singleid = "mohawk"; - params.fileBasedFallback = Mohawk::fileBased; - params.depth = 2; - params.directoryGlobs = directoryGlobs; + _singleid = "mohawk"; + _fileBasedFallback = Mohawk::fileBased; + _maxScanDepth = 2; + _directoryGlobs = directoryGlobs; } virtual const char *getName() const { return "Mohawk"; diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 09f6fa5e2e..d0610f7a29 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -223,7 +223,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { class ParallactionMetaEngine : public AdvancedMetaEngine { public: ParallactionMetaEngine() : AdvancedMetaEngine(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) { - params.guioptions = Common::GUIO_NOLAUNCHLOAD; + _guioptions = Common::GUIO_NOLAUNCHLOAD; } virtual const char *getName() const { diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index ece90855b7..2bfa04c30a 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -104,8 +104,8 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { class SagaMetaEngine : public AdvancedMetaEngine { public: SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { - params.obsoleteList = obsoleteGameIDsTable; - params.singleid = "saga"; + _obsoleteList = obsoleteGameIDsTable; + _singleid = "saga"; } virtual const char *getName() const { diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 302ba13247..8d53ce9937 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -374,7 +374,7 @@ static char s_fallbackGameIdBuf[256]; class SciMetaEngine : public AdvancedMetaEngine { public: SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles) { - params.singleid = "sci"; + _singleid = "sci"; } virtual const char *getName() const { diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index c704b3e833..b2f5795663 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -44,9 +44,9 @@ static const char *directoryGlobs[] = { class Sword25MetaEngine : public AdvancedMetaEngine { public: Sword25MetaEngine() : AdvancedMetaEngine(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) { - params.guioptions = Common::GUIO_NOMIDI; - params.depth = 2; - params.directoryGlobs = directoryGlobs; + _guioptions = Common::GUIO_NOMIDI; + _maxScanDepth = 2; + _directoryGlobs = directoryGlobs; } virtual const char *getName() const { return "Sword25"; diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index b684560bc7..b965e616f1 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -86,7 +86,7 @@ enum { class TeenAgentMetaEngine : public AdvancedMetaEngine { public: TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { - params.singleid = "teenagent"; + _singleid = "teenagent"; } virtual const char *getName() const { diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 2c3d5b43c5..b869bb8ebb 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -48,8 +48,8 @@ static const ADGameDescription testbedDescriptions[] = { class TestbedMetaEngine : public AdvancedMetaEngine { public: TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { - params.md5Bytes = 512; - params.singleid = "testbed"; + _md5Bytes = 512; + _singleid = "testbed"; } virtual const char *getName() const { diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 59a567bc63..6a221da0eb 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -77,7 +77,7 @@ static const PlainGameDescriptor tinselGames[] = { class TinselMetaEngine : public AdvancedMetaEngine { public: TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { - params.singleid = "tinsel"; + _singleid = "tinsel"; } virtual const char *getName() const { @@ -242,7 +242,7 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & if (testFile.open(allFiles[fname])) { tmp.size = (int32)testFile.size(); - tmp.md5 = computeStreamMD5AsString(testFile, params.md5Bytes); + tmp.md5 = computeStreamMD5AsString(testFile, _md5Bytes); } else { tmp.size = -1; } @@ -262,11 +262,6 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & bool fileMissing = false; - if ((params.flags & kADFlagUseExtraAsHint) && !extra.empty() && g->desc.extra != extra) - continue; - - bool allFilesPresent = true; - // Try to match all files for this game for (fileDesc = g->desc.filesDescriptions; fileDesc->fileName; fileDesc++) { // Get the next filename, stripping off any '1' suffix character @@ -284,7 +279,6 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & if (!filesSizeMD5.contains(tstr)) { fileMissing = true; - allFilesPresent = false; break; } diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 8ddfcd4fed..e72c61ac68 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -120,10 +120,10 @@ static const char * const directoryGlobs[] = { class ToonMetaEngine : public AdvancedMetaEngine { public: ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { - params.singleid = "toon"; - params.fileBasedFallback = Toon::fileBasedFallback; - params.depth = 3; - params.directoryGlobs = directoryGlobs; + _singleid = "toon"; + _fileBasedFallback = Toon::fileBasedFallback; + _maxScanDepth = 3; + _directoryGlobs = directoryGlobs; } virtual const char *getName() const { return "Toon"; diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 3e324b5685..d1dde96f59 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -129,12 +129,12 @@ static const char *directoryGlobs[] = { class ToucheMetaEngine : public AdvancedMetaEngine { public: ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { - params.md5Bytes = 4096; - params.singleid = "touche"; - params.fileBasedFallback = Touche::fileBasedFallback; - params.flags = kADFlagPrintWarningOnFileBasedFallback; - params.depth = 2; - params.directoryGlobs = directoryGlobs; + _md5Bytes = 4096; + _singleid = "touche"; + _fileBasedFallback = Touche::fileBasedFallback; + _flags = kADFlagPrintWarningOnFileBasedFallback; + _maxScanDepth = 2; + _directoryGlobs = directoryGlobs; } virtual const char *getName() const { return "Touche"; diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index e9e80312b9..aaa9030a04 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -73,9 +73,9 @@ enum { class TSageMetaEngine : public AdvancedMetaEngine { public: TSageMetaEngine() : AdvancedMetaEngine(tSage::gameDescriptions, sizeof(tSage::tSageGameDescription), tSageGameTitles) { - params.md5Bytes = 5000; - params.singleid = "tsage"; - params.guioptions = Common::GUIO_NOSPEECH; + _md5Bytes = 5000; + _singleid = "tsage"; + _guioptions = Common::GUIO_NOSPEECH; } virtual const char *getName() const { diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 3eb3973371..d7d829e1da 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -115,8 +115,8 @@ static const ADGameDescription tuckerDemoGameDescription = { class TuckerMetaEngine : public AdvancedMetaEngine { public: TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { - params.md5Bytes = 512; - params.singleid = "tucker"; + _md5Bytes = 512; + _singleid = "tucker"; } virtual const char *getName() const { -- cgit v1.2.3 From 01c4d900168c5521fa9b8342f919eb12570fac0f Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 11 Jun 2011 17:57:16 +0200 Subject: ENGINES: cleanup --- engines/game.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/game.h b/engines/game.h index f9988c2965..0d0fc853a3 100644 --- a/engines/game.h +++ b/engines/game.h @@ -53,7 +53,7 @@ struct PlainGameDescriptorGUIOpts { /** * Given a list of PlainGameDescriptors, returns the first PlainGameDescriptor * matching the given gameid. If not match is found return 0. - * The end of the list must marked by a PlainGameDescriptor with gameid equal to 0. + * The end of the list must be marked by an entry with gameid 0. */ const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const PlainGameDescriptor *list); -- cgit v1.2.3 From 6412d091268d299f7f4d31382b0e4e9e4e352ad9 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 13 Jun 2011 01:25:53 +0200 Subject: DETECTOR: Remove PlainGameDescriptorGUIOpts --- engines/game.cpp | 11 +++------- engines/game.h | 16 ++------------- engines/sword1/detection.cpp | 48 ++++++++++++++++++++++---------------------- 3 files changed, 29 insertions(+), 46 deletions(-) diff --git a/engines/game.cpp b/engines/game.cpp index a14edb8af4..c6d9905b52 100644 --- a/engines/game.cpp +++ b/engines/game.cpp @@ -38,17 +38,12 @@ GameDescriptor::GameDescriptor() { setVal("description", ""); } -GameDescriptor::GameDescriptor(const PlainGameDescriptor &pgd) { - setVal("gameid", pgd.gameid); - setVal("description", pgd.description); -} - -GameDescriptor::GameDescriptor(const PlainGameDescriptorGUIOpts &pgd) { +GameDescriptor::GameDescriptor(const PlainGameDescriptor &pgd, uint32 guioptions) { setVal("gameid", pgd.gameid); setVal("description", pgd.description); - if (pgd.guioptions != 0) - setVal("guioptions", Common::getGameGUIOptionsDescription(pgd.guioptions)); + if (guioptions != 0) + setVal("guioptions", Common::getGameGUIOptionsDescription(guioptions)); } GameDescriptor::GameDescriptor(const Common::String &g, const Common::String &d, Common::Language l, Common::Platform p, uint32 guioptions) { diff --git a/engines/game.h b/engines/game.h index 0d0fc853a3..3216cfb628 100644 --- a/engines/game.h +++ b/engines/game.h @@ -39,17 +39,6 @@ struct PlainGameDescriptor { const char *description; }; -/** - * Same as PlainGameDsscriptor except it adds Game GUI options parameter - * This is a plain struct to make it possible to declare NULL-terminated C arrays - * consisting of PlainGameDescriptors. - */ -struct PlainGameDescriptorGUIOpts { - const char *gameid; - const char *description; - uint32 guioptions; -}; - /** * Given a list of PlainGameDescriptors, returns the first PlainGameDescriptor * matching the given gameid. If not match is found return 0. @@ -67,8 +56,7 @@ const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const Pla class GameDescriptor : public Common::StringMap { public: GameDescriptor(); - GameDescriptor(const PlainGameDescriptor &pgd); - GameDescriptor(const PlainGameDescriptorGUIOpts &pgd); + GameDescriptor(const PlainGameDescriptor &pgd, uint32 guioptions = 0); GameDescriptor(const Common::String &gameid, const Common::String &description, Common::Language language = Common::UNK_LANG, @@ -102,7 +90,7 @@ public: GameList(const GameList &list) : Common::Array(list) {} GameList(const PlainGameDescriptor *g) { while (g->gameid) { - push_back(GameDescriptor(g->gameid, g->description)); + push_back(GameDescriptor(*g)); g++; } } diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index 48c3a0d14d..0c1e74082f 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -33,18 +33,18 @@ #include "engines/metaengine.h" /* Broken Sword */ -static const PlainGameDescriptorGUIOpts sword1FullSettings = - {"sword1", "Broken Sword: The Shadow of the Templars", Common::GUIO_NOMIDI}; -static const PlainGameDescriptorGUIOpts sword1DemoSettings = - {"sword1demo", "Broken Sword: The Shadow of the Templars (Demo)", Common::GUIO_NOMIDI}; -static const PlainGameDescriptorGUIOpts sword1MacFullSettings = - {"sword1mac", "Broken Sword: The Shadow of the Templars (Mac)", Common::GUIO_NOMIDI}; -static const PlainGameDescriptorGUIOpts sword1MacDemoSettings = - {"sword1macdemo", "Broken Sword: The Shadow of the Templars (Mac demo)", Common::GUIO_NOMIDI}; -static const PlainGameDescriptorGUIOpts sword1PSXSettings = - {"sword1psx", "Broken Sword: The Shadow of the Templars (PlayStation)", Common::GUIO_NOMIDI}; -static const PlainGameDescriptorGUIOpts sword1PSXDemoSettings = - {"sword1psxdemo", "Broken Sword: The Shadow of the Templars (PlayStation demo)", Common::GUIO_NOMIDI}; +static const PlainGameDescriptor sword1FullSettings = + {"sword1", "Broken Sword: The Shadow of the Templars"}; +static const PlainGameDescriptor sword1DemoSettings = + {"sword1demo", "Broken Sword: The Shadow of the Templars (Demo)"}; +static const PlainGameDescriptor sword1MacFullSettings = + {"sword1mac", "Broken Sword: The Shadow of the Templars (Mac)"}; +static const PlainGameDescriptor sword1MacDemoSettings = + {"sword1macdemo", "Broken Sword: The Shadow of the Templars (Mac demo)"}; +static const PlainGameDescriptor sword1PSXSettings = + {"sword1psx", "Broken Sword: The Shadow of the Templars (PlayStation)"}; +static const PlainGameDescriptor sword1PSXDemoSettings = + {"sword1psxdemo", "Broken Sword: The Shadow of the Templars (PlayStation demo)"}; // check these subdirectories (if present) @@ -117,12 +117,12 @@ bool Sword1::SwordEngine::hasFeature(EngineFeature f) const { GameList SwordMetaEngine::getSupportedGames() const { GameList games; - games.push_back(sword1FullSettings); - games.push_back(sword1DemoSettings); - games.push_back(sword1MacFullSettings); - games.push_back(sword1MacDemoSettings); - games.push_back(sword1PSXSettings); - games.push_back(sword1PSXDemoSettings); + games.push_back(GameDescriptor(sword1FullSettings, Common::GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1DemoSettings, Common::GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1MacFullSettings, Common::GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1MacDemoSettings, Common::GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1PSXSettings, Common::GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1PSXDemoSettings, Common::GUIO_NOMIDI)); return games; } @@ -198,17 +198,17 @@ GameList SwordMetaEngine::detectGames(const Common::FSList &fslist) const { psxDemoFilesFound = false; if (mainFilesFound && pcFilesFound && demoFilesFound) - detectedGames.push_back(sword1DemoSettings); + detectedGames.push_back(GameDescriptor(sword1DemoSettings, Common::GUIO_NOMIDI)); else if (mainFilesFound && pcFilesFound && psxFilesFound) - detectedGames.push_back(sword1PSXSettings); + detectedGames.push_back(GameDescriptor(sword1PSXSettings, Common::GUIO_NOMIDI)); else if (mainFilesFound && pcFilesFound && psxDemoFilesFound) - detectedGames.push_back(sword1PSXDemoSettings); + detectedGames.push_back(GameDescriptor(sword1PSXDemoSettings, Common::GUIO_NOMIDI)); else if (mainFilesFound && pcFilesFound && !psxFilesFound) - detectedGames.push_back(sword1FullSettings); + detectedGames.push_back(GameDescriptor(sword1FullSettings, Common::GUIO_NOMIDI)); else if (mainFilesFound && macFilesFound) - detectedGames.push_back(sword1MacFullSettings); + detectedGames.push_back(GameDescriptor(sword1MacFullSettings, Common::GUIO_NOMIDI)); else if (mainFilesFound && macDemoFilesFound) - detectedGames.push_back(sword1MacDemoSettings); + detectedGames.push_back(GameDescriptor(sword1MacDemoSettings, Common::GUIO_NOMIDI)); return detectedGames; } -- cgit v1.2.3 From 593b929047434eefa9b6dfb73730f7d502c4ff10 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 15:25:33 +0200 Subject: DETECTOR: Separate code for handling obsolete gameids from advanced detector This includes a renaming of ADObsoleteGameID to Engine::ObsoleteGameID, and AdvancedDetector::findGameID now is Engines::findGameID. Doxygen comments were added or improved --- engines/advancedDetector.cpp | 73 ++++----------------------------- engines/advancedDetector.h | 35 ++-------------- engines/agos/detection.cpp | 14 ++++++- engines/cine/detection.cpp | 13 +++++- engines/gob/detection.cpp | 13 +++++- engines/module.mk | 1 + engines/obsolete.cpp | 88 ++++++++++++++++++++++++++++++++++++++++ engines/obsolete.h | 78 +++++++++++++++++++++++++++++++++++ engines/saga/detection.cpp | 14 ++++++- engines/scumm/detection.cpp | 17 +------- engines/scumm/detection_tables.h | 4 +- 11 files changed, 228 insertions(+), 122 deletions(-) create mode 100644 engines/obsolete.cpp create mode 100644 engines/obsolete.h diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 5a4c493bf7..21807cb5f9 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -32,68 +32,7 @@ #include "common/translation.h" #include "engines/advancedDetector.h" - -void AdvancedMetaEngine::upgradeTargetIfNecessary() const { - if (_obsoleteList == 0) - return; - - Common::String gameid = ConfMan.get("gameid"); - - for (const ADObsoleteGameID *o = _obsoleteList; o->from; ++o) { - if (gameid.equalsIgnoreCase(o->from)) { - gameid = o->to; - ConfMan.set("gameid", gameid); - - if (o->platform != Common::kPlatformUnknown) - ConfMan.set("platform", Common::getPlatformCode(o->platform)); - - warning("Target upgraded from %s to %s", o->from, o->to); - - // WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching - // undefined target adds launcher entry" - if (ConfMan.hasKey("id_came_from_command_line")) { - warning("Target came from command line. Skipping save"); - } else { - ConfMan.flushToDisk(); - } - break; - } - } -} - -namespace AdvancedDetector { - -GameDescriptor findGameID( - const char *gameid, - const PlainGameDescriptor *gameids, - const ADObsoleteGameID *obsoleteList - ) { - // First search the list of supported gameids for a match. - const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, gameids); - if (g) - return GameDescriptor(*g); - - // If we didn't find the gameid in the main list, check if it - // is an obsolete game id. - if (obsoleteList != 0) { - const ADObsoleteGameID *o = obsoleteList; - while (o->from) { - if (0 == scumm_stricmp(gameid, o->from)) { - g = findPlainGameDescriptor(o->to, gameids); - if (g && g->description) - return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")"); - else - return GameDescriptor(gameid, "Obsolete game ID"); - } - o++; - } - } - - // No match found - return GameDescriptor(); -} - -} // End of namespace AdvancedDetector +#include "engines/obsolete.h" static GameDescriptor toGameDescriptor(const ADGameDescription &g, const PlainGameDescriptor *sg) { const char *title = 0; @@ -218,7 +157,6 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) const { assert(engine); - upgradeTargetIfNecessary(); const ADGameDescription *agdDesc = 0; Common::Language language = Common::UNK_LANG; @@ -605,14 +543,19 @@ GameList AdvancedMetaEngine::getSupportedGames() const { } GameDescriptor AdvancedMetaEngine::findGame(const char *gameid) const { - return AdvancedDetector::findGameID(gameid, _gameids, _obsoleteList); + // First search the list of supported gameids for a match. + const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, _gameids); + if (g) + return GameDescriptor(*g); + + // No match found + return GameDescriptor(); } AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameids) : _gameDescriptors((const byte *)descs), _descItemSize(descItemSize), _gameids(gameids) { _md5Bytes = 5000; - _obsoleteList = NULL; _singleid = NULL; _fileBasedFallback = NULL; _flags = 0; diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 8eb215ef18..5f7bfa401c 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ + #ifndef ENGINES_ADVANCED_DETECTOR_H #define ENGINES_ADVANCED_DETECTOR_H @@ -73,7 +74,7 @@ struct ADGameDescription { /** * A list of pointers to ADGameDescription structs (or subclasses thereof). */ -typedef Common::Array ADGameDescList; +typedef Common::Array ADGameDescList; /** * End marker for a table of ADGameDescription structs. Use this to @@ -82,13 +83,6 @@ typedef Common::Array ADGameDescList; #define AD_TABLE_END_MARKER \ { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, ADGF_NO_FLAGS, Common::GUIO_NONE } - -struct ADObsoleteGameID { - const char *from; - const char *to; - Common::Platform platform; -}; - struct ADFileBasedFallback { /** * Pointer to an ADGameDescription or subclass thereof which will get @@ -119,21 +113,6 @@ enum ADFlags { }; -namespace AdvancedDetector { - -/** - * Scan through the game descriptors specified in params and search for - * 'gameid' in there. If a match is found, returns a GameDescriptor - * with gameid and description set. - */ -GameDescriptor findGameID( - const char *gameid, - const PlainGameDescriptor *gameids, - const ADObsoleteGameID *obsoleteList = 0 - ); - -} // End of namespace AdvancedDetector - /** * A MetaEngine implementation based around the advanced detector code. */ @@ -169,13 +148,6 @@ protected: */ const PlainGameDescriptor *_gameids; - /** - * Structure for autoupgrading obsolete targets (optional). - * - * @todo Properly explain this. - */ - const ADObsoleteGameID *_obsoleteList; - /** * Name of single gameid (optional). * @@ -274,8 +246,7 @@ protected: */ ADGameDescList detectGameFilebased(const FileMap &allFiles) const; - void upgradeTargetIfNecessary() const; - + // TODO void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const; /** diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 06606e71b3..2be888b92a 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -23,6 +23,7 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" +#include "engines/obsolete.h" #include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" @@ -48,7 +49,7 @@ struct AGOSGameDescription { * corresponding new target and platform combination. * */ -static const ADObsoleteGameID obsoleteGameIDsTable[] = { +static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { {"simon1acorn", "simon1", Common::kPlatformAcorn}, {"simon1amiga", "simon1", Common::kPlatformAmiga}, {"simon1cd32", "simon1", Common::kPlatformAmiga}, @@ -92,12 +93,15 @@ using namespace AGOS; class AgosMetaEngine : public AdvancedMetaEngine { public: AgosMetaEngine() : AdvancedMetaEngine(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { - _obsoleteList = obsoleteGameIDsTable; _guioptions = Common::GUIO_NOLAUNCHLOAD; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } + virtual GameDescriptor findGame(const char *gameid) const { + return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + } + virtual const char *getName() const { return "AGOS"; } @@ -107,7 +111,13 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; + + virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { + Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); + return AdvancedMetaEngine::createInstance(syst, engine); + } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; + virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; }; diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 691acea2b3..cffeb29418 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -23,6 +23,7 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" +#include "engines/obsolete.h" #include "common/system.h" #include "common/textconsole.h" @@ -52,7 +53,7 @@ static const PlainGameDescriptor cineGames[] = { {0, 0} }; -static const ADObsoleteGameID obsoleteGameIDsTable[] = { +static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { {"fw", "cine", Common::kPlatformUnknown}, {"os", "cine", Common::kPlatformUnknown}, {0, 0, Common::kPlatformUnknown} @@ -63,11 +64,14 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { class CineMetaEngine : public AdvancedMetaEngine { public: CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames) { - _obsoleteList = obsoleteGameIDsTable; _singleid = "cine"; _guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; } + virtual GameDescriptor findGame(const char *gameid) const { + return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + } + virtual const char *getName() const { return "Cine"; } @@ -76,7 +80,12 @@ public: return "Future Wars & Operation Stealth (C) Delphine Software"; } + virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { + Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); + return AdvancedMetaEngine::createInstance(syst, engine); + } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; + virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index e30380a5a5..2050539d60 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -22,6 +22,7 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" +#include "engines/obsolete.h" #include "gob/gob.h" @@ -78,7 +79,7 @@ static const PlainGameDescriptor gobGames[] = { {0, 0} }; -static const ADObsoleteGameID obsoleteGameIDsTable[] = { +static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { {"gob1", "gob", kPlatformUnknown}, {"gob2", "gob", kPlatformUnknown}, {0, 0, kPlatformUnknown} @@ -89,12 +90,15 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { class GobMetaEngine : public AdvancedMetaEngine { public: GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { - _obsoleteList = obsoleteGameIDsTable; _singleid = "gob"; _fileBasedFallback = Gob::fileBased; _guioptions = Common::GUIO_NOLAUNCHLOAD; } + virtual GameDescriptor findGame(const char *gameid) const { + return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + } + virtual const char *getName() const { return "Gob"; } @@ -104,6 +108,11 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; + + virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { + Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); + return AdvancedMetaEngine::createInstance(syst, engine); + } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; }; diff --git a/engines/module.mk b/engines/module.mk index 643310002f..7849c2ff25 100644 --- a/engines/module.mk +++ b/engines/module.mk @@ -5,6 +5,7 @@ MODULE_OBJS := \ dialogs.o \ engine.o \ game.o \ + obsolete.o \ savestate.o # Include common rules diff --git a/engines/obsolete.cpp b/engines/obsolete.cpp new file mode 100644 index 0000000000..6733a384be --- /dev/null +++ b/engines/obsolete.cpp @@ -0,0 +1,88 @@ +/* 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 "engines/obsolete.h" + +#include "common/config-manager.h" + + +namespace Engines { + +void upgradeTargetIfNecessary(const ObsoleteGameID *obsoleteList) { + if (obsoleteList == 0) + return; + + Common::String gameid = ConfMan.get("gameid"); + + for (const ObsoleteGameID *o = obsoleteList; o->from; ++o) { + if (gameid.equalsIgnoreCase(o->from)) { + gameid = o->to; + ConfMan.set("gameid", gameid); + + if (o->platform != Common::kPlatformUnknown) + ConfMan.set("platform", Common::getPlatformCode(o->platform)); + + warning("Target upgraded from %s to %s", o->from, o->to); + + // WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching + // undefined target adds launcher entry" + if (ConfMan.hasKey("id_came_from_command_line")) { + warning("Target came from command line. Skipping save"); + } else { + ConfMan.flushToDisk(); + } + break; + } + } +} + +GameDescriptor findGameID( + const char *gameid, + const PlainGameDescriptor *gameids, + const ObsoleteGameID *obsoleteList + ) { + // First search the list of supported gameids for a match. + const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, gameids); + if (g) + return GameDescriptor(*g); + + // If we didn't find the gameid in the main list, check if it + // is an obsolete game id. + if (obsoleteList != 0) { + const ObsoleteGameID *o = obsoleteList; + while (o->from) { + if (0 == scumm_stricmp(gameid, o->from)) { + g = findPlainGameDescriptor(o->to, gameids); + if (g && g->description) + return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")"); + else + return GameDescriptor(gameid, "Obsolete game ID"); + } + o++; + } + } + + // No match found + return GameDescriptor(); +} + +} // End of namespace Engines diff --git a/engines/obsolete.h b/engines/obsolete.h new file mode 100644 index 0000000000..97bc7524a6 --- /dev/null +++ b/engines/obsolete.h @@ -0,0 +1,78 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef ENGINES_OBSOLETE_H +#define ENGINES_OBSOLETE_H + +#include "engines/game.h" + +namespace Engines { + +/** + * Structure for autoupgrading targets using an obsolete gameid + * to the correct new gameid. + */ +struct ObsoleteGameID { + + /** Name of the obsolete gameid. */ + const char *from; + + /** Name of the corresponding new gameid. */ + const char *to; + + /** + * If platform is set to a value different from Common::kPlatformUnknown, + * then upgradeTargetIfNecessary() will use this value to set the platform + * attribute of any target it updates using this ObsoleteGameID record. + * This is useful when the old gameid encoded the target platform (e.g. + * "zakTowns" for FM-TOWNS) while the new gameid does not (e.g. "zak"). + */ + Common::Platform platform; +}; + +/** + * Check if the currently active game target has an obsolete gameid; + * if so, replace it by the correct new gameid. + * This function is typically invoked by a MetaEngine::createInstance + * implementation. + */ +void upgradeTargetIfNecessary(const ObsoleteGameID *obsoleteList); + + +/** + * Scan through the given list of plain game descriptors specified and search + * for 'gameid' in there. If a match is found, returns a GameDescriptor + * with gameid and description set. + * + * Optionally can take a list of obsolete game ids into account in order + * to support obsolete gameids. + */ +GameDescriptor findGameID( + const char *gameid, + const PlainGameDescriptor *gameids, + const ObsoleteGameID *obsoleteList = 0 + ); + + +} // End of namespace Engines + +#endif diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 2bfa04c30a..7a98fe4164 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -28,6 +28,7 @@ #include "common/config-manager.h" #include "engines/advancedDetector.h" +#include "engines/obsolete.h" #include "common/system.h" #include "graphics/thumbnail.h" @@ -91,7 +92,7 @@ static const PlainGameDescriptor sagaGames[] = { {0, 0} }; -static const ADObsoleteGameID obsoleteGameIDsTable[] = { +static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { {"ite", "saga", Common::kPlatformUnknown}, {"ihnm", "saga", Common::kPlatformUnknown}, {"dino", "saga", Common::kPlatformUnknown}, @@ -104,10 +105,13 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = { class SagaMetaEngine : public AdvancedMetaEngine { public: SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { - _obsoleteList = obsoleteGameIDsTable; _singleid = "saga"; } + virtual GameDescriptor findGame(const char *gameid) const { + return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + } + virtual const char *getName() const { return "SAGA [" @@ -135,7 +139,13 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; + + virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { + Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); + return AdvancedMetaEngine::createInstance(syst, engine); + } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; + virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index aecd13db5a..4b673ad8ff 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -882,7 +882,7 @@ GameList ScummMetaEngine::getSupportedGames() const { } GameDescriptor ScummMetaEngine::findGame(const char *gameid) const { - return AdvancedDetector::findGameID(gameid, gameDescriptions, obsoleteGameIDsTable); + return Engines::findGameID(gameid, gameDescriptions, obsoleteGameIDsTable); } static Common::String generatePreferredTarget(const DetectorResult &x) { @@ -975,20 +975,7 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co // We start by checking whether the specified game ID is obsolete. // If that is the case, we automatically upgrade the target to use // the correct new game ID (and platform, if specified). - for (const ADObsoleteGameID *o = obsoleteGameIDsTable; o->from; ++o) { - if (!scumm_stricmp(gameid, o->from)) { - // Match found, perform upgrade - gameid = o->to; - ConfMan.set("gameid", o->to); - - if (o->platform != Common::kPlatformUnknown) - ConfMan.set("platform", Common::getPlatformCode(o->platform)); - - warning("Target upgraded from game ID %s to %s", o->from, o->to); - ConfMan.flushToDisk(); - break; - } - } + Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); // Fetch the list of files in the current directory Common::FSList fslist; diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 7eb1e80132..e510c46cf2 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -23,7 +23,7 @@ #ifndef SCUMM_DETECTION_TABLES_H #define SCUMM_DETECTION_TABLES_H -#include "engines/advancedDetector.h" +#include "engines/obsolete.h" #include "common/rect.h" #include "common/util.h" @@ -145,7 +145,7 @@ static const PlainGameDescriptor gameDescriptions[] = { * Conversion table mapping old obsolete game IDs to the * corresponding new game ID and platform combination. */ -static const ADObsoleteGameID obsoleteGameIDsTable[] = { +static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { {"bluesabctimedemo", "bluesabctime", UNK}, {"BluesBirthdayDemo", "BluesBirthday", UNK}, {"comidemo", "comi", UNK}, -- cgit v1.2.3 From e6f6d67bddd2a3f258616d00049ca12823bc4f74 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 16:26:54 +0200 Subject: TOUCHE: cleanup --- engines/touche/touche.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/engines/touche/touche.h b/engines/touche/touche.h index 7e1aa3ac44..cbb3fec7aa 100644 --- a/engines/touche/touche.h +++ b/engines/touche/touche.h @@ -385,8 +385,6 @@ public: protected: - bool detectGame(); - void restart(); void readConfigurationSettings(); void writeConfigurationSettings(); -- cgit v1.2.3 From 7e7748d69257d0cc24cfccd51c0d6b7d9213a986 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 16:36:54 +0200 Subject: LURE: Add a comment explaining why kADFlagUseExtraAsHint is used For the records, this was introduced by Eugene in SVN revision 30106, corresponding to git commit b87b0f21 --- engines/lure/detection.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 397d965396..081625863d 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -180,6 +180,9 @@ public: LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) { _md5Bytes = 1024; _singleid = "lure"; + + // Use kADFlagUseExtraAsHint to distinguish between EGA and VGA versions + // of italian Lure when their datafiles sit in the same directory. _flags = kADFlagUseExtraAsHint; _guioptions = Common::GUIO_NOSPEECH; } -- cgit v1.2.3 From 3b5863834bbd97de521af3d6ee2441ea2d609d14 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 16:48:45 +0200 Subject: GROOVIE: Document why I *think* kADFlagUseExtraAsHint is used --- engines/groovie/detection.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index cb0f2296fb..2065307ca9 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -206,6 +206,15 @@ class GroovieMetaEngine : public AdvancedMetaEngine { public: GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames) { _singleid = "groovie"; + + // Use kADFlagUseExtraAsHint in order to distinguish the 11th hour from + // its "Making of" as well as the Clandestiny Trailer; they all share + // the same MD5. + // TODO: Is this the only reason, or are there others (like the three + // potentially sharing a single directory) ? In the former case, then + // perhaps a better solution would be to add additional files + // to the detection entries. In the latter case, this TODO should be + // replaced with an according explanation. _flags = kADFlagUseExtraAsHint; _guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; } -- cgit v1.2.3 From ee9276b816c67d3423e260c4460f1030668270d4 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 17:08:08 +0200 Subject: SCUMM: Fix doxygen comments --- engines/scumm/resource.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/scumm/resource.h b/engines/scumm/resource.h index e8b0c1eaae..2e8960717f 100644 --- a/engines/scumm/resource.h +++ b/engines/scumm/resource.h @@ -63,9 +63,9 @@ class ScummEngine; * marked in this way. */ enum ResTypeMode { - kDynamicResTypeMode = 0, ///!< Resource is generated during runtime and may change - kStaticResTypeMode = 1, ///!< Resource comes from data files, does not change - kSoundResTypeMode = 2 ///!< Resource comes from data files, but may change + kDynamicResTypeMode = 0, ///< Resource is generated during runtime and may change + kStaticResTypeMode = 1, ///< Resource comes from data files, does not change + kSoundResTypeMode = 2 ///< Resource comes from data files, but may change }; /** -- cgit v1.2.3 From 49a1ea17892eaeca56fb7913a14f66dca652831d Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 17:13:02 +0200 Subject: DETECTOR: Cleanup, extend doxygen comments --- engines/advancedDetector.cpp | 4 ++- engines/advancedDetector.h | 66 ++++++++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 21807cb5f9..5d13fb313a 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -167,9 +167,10 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) language = Common::parseLanguage(ConfMan.get("language")); if (ConfMan.hasKey("platform")) platform = Common::parsePlatform(ConfMan.get("platform")); - if (_flags & kADFlagUseExtraAsHint) + if (_flags & kADFlagUseExtraAsHint) { if (ConfMan.hasKey("extra")) extra = ConfMan.get("extra"); + } Common::String gameid = ConfMan.get("gameid"); @@ -205,6 +206,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) return Common::kNoGameDataFoundError; if (_singleid == NULL) { + // Find the first match with correct gameid. for (uint i = 0; i < matches.size(); i++) { if (matches[i]->gameid == gameid) { agdDesc = matches[i]; diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 5f7bfa401c..00a3faf58f 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -30,28 +30,45 @@ class Error; class FSList; } - +/** + * A record describing a file to be matched for detecting a specific game + * variant. A list of such records is used inside every ADGameDescription to + * enable detection. + */ struct ADGameFileDescription { - const char *fileName; - uint16 fileType; // Optional. Not used during detection, only by engines. - const char *md5; // Optional. May be NULL. - int32 fileSize; // Optional. Set to -1 to ignore. + const char *fileName; ///< Name of described file. + uint16 fileType; ///< Optional. Not used during detection, only by engines. + const char *md5; ///< MD5 of (the beginning of) the described file. Optional. Set to NULL to ignore. + int32 fileSize; ///< Size of the described file. Set to -1 to ignore. }; +/** + * A shortcut to produce an empty ADGameFileDescription record. Used to mark + * the end of a list of these. + */ #define AD_LISTEND {NULL, 0, NULL, 0} +/** + * A shortcut to produce a list of ADGameFileDescription records with only one + * record that contains just a filename with an MD5, and no file size. + */ #define AD_ENTRY1(f, x) {{ f, 0, x, -1}, AD_LISTEND} + +/** + * A shortcut to produce a list of ADGameFileDescription records with only one + * record that contains just a filename with an MD5, plus a file size. + */ #define AD_ENTRY1s(f, x, s) {{ f, 0, x, s}, AD_LISTEND} enum ADGameFlags { ADGF_NO_FLAGS = 0, - ADGF_PIRATED = (1 << 23), // flag to designate well known pirated versions with cracks - ADGF_ADDENGLISH = (1 << 24), // always add English as language option - ADGF_MACRESFORK = (1 << 25), // the md5 for this entry will be calculated from the resource fork - ADGF_USEEXTRAASTITLE = (1 << 26), // Extra field value will be used as main game title, not gameid - ADGF_DROPLANGUAGE = (1 << 28), // don't add language to gameid - ADGF_CD = (1 << 29), // add "-cd" to gameid - ADGF_DEMO = (1 << 30) // add "-demo" to gameid + ADGF_PIRATED = (1 << 23), ///< flag to designate well known pirated versions with cracks + ADGF_ADDENGLISH = (1 << 24), ///< always add English as language option + ADGF_MACRESFORK = (1 << 25), ///< the md5 for this entry will be calculated from the resource fork + ADGF_USEEXTRAASTITLE = (1 << 26), ///< Extra field value will be used as main game title, not gameid + ADGF_DROPLANGUAGE = (1 << 28), ///< don't add language to gameid + ADGF_CD = (1 << 29), ///< add "-cd" to gameid + ADGF_DEMO = (1 << 30) ///< add "-demo" to gameid }; struct ADGameDescription { @@ -130,7 +147,13 @@ protected: * The size of a single entry of the above descs array. Always * must be >= sizeof(ADGameDescription). */ - uint _descItemSize; + const uint _descItemSize; + + /** + * A list of all gameids (and their corresponding descriptions) supported + * by this engine. + */ + const PlainGameDescriptor *_gameids; /** * The number of bytes to compute MD5 sum for. The AdvancedDetector @@ -138,16 +161,10 @@ protected: * Since doing that for large files can be slow, it can be restricted * to a subset of all files. * Typically this will be set to something between 5 and 50 kilobyte, - * but arbitrary non-zero values are possible. + * but arbitrary non-zero values are possible. The default is 5000. */ uint _md5Bytes; - /** - * A list of all gameids (and their corresponding descriptions) supported - * by this engine. - */ - const PlainGameDescriptor *_gameids; - /** * Name of single gameid (optional). * @@ -228,13 +245,14 @@ protected: /** * Detect games in specified directory. * Parameters language and platform are used to pass on values - * specified by the user. I.e. this is used to restrict search scope. + * specified by the user. This is used to restrict search scope. * * @param fslist FSList to scan or NULL for scanning all specified * default directories. - * @param language restrict results to specified language only - * @param platform restrict results to specified platform only - * @return list of ADGameDescription (or subclass) pointers corresponding to matched games + * @param language restrict results to specified language + * @param platform restrict results to specified platform + * @param extra restrict results to specified extra string (only if kADFlagUseExtraAsHint is set) + * @return list of ADGameDescription pointers corresponding to matched games */ ADGameDescList detectGame(const Common::FSList &fslist, Common::Language language, Common::Platform platform, const Common::String &extra) const; -- cgit v1.2.3 From 068620479202f93c3057bc24f33a8c6f3da5a68d Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 17:26:55 +0200 Subject: DETECTOR: cleanup --- engines/advancedDetector.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 5d13fb313a..cd94ce48e4 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -106,7 +106,7 @@ void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGame } bool cleanupPirated(ADGameDescList &matched) { - // OKay, now let's sense presense of pirated games + // OKay, now let's sense presence of pirated games if (!matched.empty()) { for (uint j = 0; j < matched.size();) { if (matched[j]->flags & ADGF_PIRATED) @@ -117,9 +117,7 @@ bool cleanupPirated(ADGameDescList &matched) { // We ruled out all variants and now have nothing if (matched.empty()) { - warning("Illegitimate game copy detected. We give no support in such cases %d", matched.size()); - return true; } } @@ -132,9 +130,6 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { ADGameDescList matches = detectGame(fslist, Common::UNK_LANG, Common::kPlatformUnknown, ""); GameList detectedGames; - if (cleanupPirated(matches)) - return detectedGames; - if (matches.empty()) { // Use fallback detector if there were no matches by other means const ADGameDescription *fallbackDesc = fallbackDetect(fslist); @@ -145,6 +140,7 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { } } else { // Otherwise use the found matches + cleanupPirated(matches); for (uint i = 0; i < matches.size(); i++) { GameDescriptor desc(toGameDescriptor(*matches[i], _gameids)); updateGameDescriptor(desc, matches[i]); -- cgit v1.2.3 From 64e523141fa619c1632dcb2b215cfd85c41ef5a1 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 17:32:13 +0200 Subject: DETECTOR: Change detectGameFilebased return value --- engines/advancedDetector.cpp | 14 +++++++------- engines/advancedDetector.h | 14 +++++++++----- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index cd94ce48e4..9a05e8513d 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -461,14 +461,17 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Comm } // Filename based fallback - if (_fileBasedFallback != 0) - matched = detectGameFilebased(allFiles); + if (_fileBasedFallback != 0) { + g = detectGameFilebased(allFiles); + if (g) + matched.push_back(g); + } } return matched; } -ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) const { +const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) const { const ADFileBasedFallback *ptr; const char* const* filenames; @@ -502,10 +505,7 @@ ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) } } - ADGameDescList matched; - if (matchedDesc) { // We got a match - matched.push_back(matchedDesc); if (_flags & kADFlagPrintWarningOnFileBasedFallback) { Common::String report = Common::String::format(_("Your game version has been detected using " "filename matching as a variant of %s."), matchedDesc->gameid); @@ -518,7 +518,7 @@ ADGameDescList AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) } } - return matched; + return matchedDesc; } GameList AdvancedMetaEngine::getSupportedGames() const { diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 00a3faf58f..976f17ce35 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -257,12 +257,16 @@ protected: ADGameDescList detectGame(const Common::FSList &fslist, Common::Language language, Common::Platform platform, const Common::String &extra) const; /** - * Check for each ADFileBasedFallback record whether all files listed - * in it are present. If multiple pass this test, we pick the one with - * the maximal number of matching files. In case of a tie, the entry - * coming first in the list is chosen. + * Iterates over all ADFileBasedFallback records inside _fileBasedFallback. + * This then returns the record (or rather, the ADGameDescription + * contained in it) for which all files described by it are present, and + * among those the one with the maximal number of matching files. + * In case of a tie, the entry coming first in the list is chosen. + * + * @param allFiles a map describing all present files + * @param fileBasedFallback a list of ADFileBasedFallback records, zero-terminated */ - ADGameDescList detectGameFilebased(const FileMap &allFiles) const; + const ADGameDescription *detectGameFilebased(const FileMap &allFiles) const; // TODO void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const; -- cgit v1.2.3 From 879c3c78177ee2ff95c0d22f82d3448877d6fa98 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 18:02:09 +0200 Subject: DETECTOR: Pass allFiles to AdvancedMetaEngine::fallbackDetect() Also reorder the parameters of composeFileHashMap, placing the "return value" first. --- engines/advancedDetector.cpp | 43 ++++++++++++++++++++++++++--------------- engines/advancedDetector.h | 13 ++++++------- engines/agi/detection.cpp | 4 ++-- engines/made/detection.cpp | 4 ++-- engines/sci/detection.cpp | 5 +++-- engines/scumm/detection.cpp | 7 +++---- engines/teenagent/detection.cpp | 4 ---- engines/tinsel/detection.cpp | 4 ++-- engines/tucker/detection.cpp | 2 +- 9 files changed, 46 insertions(+), 40 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 9a05e8513d..c9f4f38b77 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -127,12 +127,22 @@ bool cleanupPirated(ADGameDescList &matched) { GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { - ADGameDescList matches = detectGame(fslist, Common::UNK_LANG, Common::kPlatformUnknown, ""); + ADGameDescList matches; GameList detectedGames; + FileMap allFiles; + + if (fslist.empty()) + return detectedGames; + + // Compose a hashmap of all files in fslist. + composeFileHashMap(allFiles, fslist, (_maxScanDepth == 0 ? 1 : _maxScanDepth)); + + // Run the detector on this + matches = detectGame(fslist.begin()->getParent(), allFiles, Common::UNK_LANG, Common::kPlatformUnknown, ""); if (matches.empty()) { // Use fallback detector if there were no matches by other means - const ADGameDescription *fallbackDesc = fallbackDetect(fslist); + const ADGameDescription *fallbackDesc = fallbackDetect(allFiles, fslist); if (fallbackDesc != 0) { GameDescriptor desc(toGameDescriptor(*fallbackDesc, _gameids)); updateGameDescriptor(desc, fallbackDesc); @@ -196,7 +206,15 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) return Common::kNoGameDataFoundError; } - ADGameDescList matches = detectGame(files, language, platform, extra); + if (files.empty()) + return Common::kNoGameDataFoundError; + + // Compose a hashmap of all files in fslist. + FileMap allFiles; + composeFileHashMap(allFiles, files, (_maxScanDepth == 0 ? 1 : _maxScanDepth)); + + // Run the detector on this + ADGameDescList matches = detectGame(files.begin()->getParent(), allFiles, language, platform, extra); if (cleanupPirated(matches)) return Common::kNoGameDataFoundError; @@ -215,7 +233,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (agdDesc == 0) { // Use fallback detector if there were no matches by other means - agdDesc = fallbackDetect(files); + agdDesc = fallbackDetect(allFiles, files); if (agdDesc != 0) { // Seems we found a fallback match. But first perform a basic // sanity check: the gameid must match. @@ -270,7 +288,7 @@ static void reportUnknown(const Common::FSNode &path, const SizeMD5Map &filesSiz g_system->logMessage(LogMessageType::kInfo, report.c_str()); } -void AdvancedMetaEngine::composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth) const { +void AdvancedMetaEngine::composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth) const { if (depth <= 0) return; @@ -297,7 +315,7 @@ void AdvancedMetaEngine::composeFileHashMap(const Common::FSList &fslist, FileMa if (!file->getChildren(files, Common::FSNode::kListAll)) continue; - composeFileHashMap(files, allFiles, depth - 1); + composeFileHashMap(allFiles, files, depth - 1); } Common::String tstr = file->getName(); @@ -310,24 +328,17 @@ void AdvancedMetaEngine::composeFileHashMap(const Common::FSList &fslist, FileMa } } -ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSList &fslist, Common::Language language, Common::Platform platform, const Common::String &extra) const { - FileMap allFiles; +ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const { SizeMD5Map filesSizeMD5; const ADGameFileDescription *fileDesc; const ADGameDescription *g; const byte *descPtr; - if (fslist.empty()) - return ADGameDescList(); - Common::FSNode parent = fslist.begin()->getParent(); debug(3, "Starting detection in dir '%s'", parent.getPath().c_str()); - // First we compose a hashmap of all files in fslist. - composeFileHashMap(fslist, allFiles, (_maxScanDepth == 0 ? 1 : _maxScanDepth)); - - // Check which files are included in some ADGameDescription *and* present - // in fslist. Compute MD5s and file sizes for these files. + // Check which files are included in some ADGameDescription *and* are present. + // Compute MD5s and file sizes for these files. for (descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += _descItemSize) { g = (const ADGameDescription *)descPtr; diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 976f17ce35..c48e4a9815 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -230,31 +230,30 @@ protected: // To be implemented by subclasses virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const = 0; + typedef Common::HashMap FileMap; + /** * An (optional) generic fallback detect function which is invoked * if both the regular MD5 based detection as well as the file * based fallback failed to detect anything. */ - virtual const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { return 0; } protected: - typedef Common::HashMap FileMap; - /** * Detect games in specified directory. * Parameters language and platform are used to pass on values * specified by the user. This is used to restrict search scope. * - * @param fslist FSList to scan or NULL for scanning all specified - * default directories. + * @param allFiles list of all present files, as computed by composeFileHashMap * @param language restrict results to specified language * @param platform restrict results to specified platform * @param extra restrict results to specified extra string (only if kADFlagUseExtraAsHint is set) * @return list of ADGameDescription pointers corresponding to matched games */ - ADGameDescList detectGame(const Common::FSList &fslist, Common::Language language, Common::Platform platform, const Common::String &extra) const; + ADGameDescList detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const; /** * Iterates over all ADFileBasedFallback records inside _fileBasedFallback. @@ -275,7 +274,7 @@ protected: * Compose a hashmap of all files in fslist. * Includes nifty stuff like removing trailing dots and ignoring case. */ - void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth) const; + void composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth) const; }; #endif diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 427ffef1ad..21ff5deb2c 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -155,7 +155,7 @@ public: virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; - const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; + const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; }; bool AgiMetaEngine::hasFeature(MetaEngineFeature f) const { @@ -293,7 +293,7 @@ SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int sl return SaveStateDescriptor(); } -const ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSList &fslist) const { +const ADGameDescription *AgiMetaEngine::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const { typedef Common::HashMap IntMap; IntMap allFiles; bool matchedUsingFilenames = false; diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index fcbee9cb32..e8c948af4e 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -542,7 +542,7 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; - const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; + const ADGameDescription *fallbackDetect(const Common::FSList &fslist, const FileMap &allFiles) const; }; @@ -564,7 +564,7 @@ bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame return gd != 0; } -const ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist) const { +const ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist, const FileMap &allFiles) const { // Set the default values for the fallback descriptor's ADGameDescription part. Made::g_fallbackDesc.desc.language = Common::UNK_LANG; Made::g_fallbackDesc.desc.platform = Common::kPlatformPC; diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 8d53ce9937..7bc9699e9b 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -390,7 +390,7 @@ public: } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; - const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; + const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; @@ -418,7 +418,7 @@ Common::Language charToScummVMLanguage(const char c) { } } -const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fslist) const { +const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { bool foundResMap = false; bool foundRes000 = false; @@ -430,6 +430,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl s_fallbackDesc.gameid = "sci"; // First grab all filenames + // TODO: Consider using allFiles instead of fslist for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (file->isDirectory()) continue; diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 4b673ad8ff..e5c5906404 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -431,7 +431,7 @@ static void computeGameSettingsFromMD5(const Common::FSList &fslist, const GameF } } -static void composeFileHashMap(const Common::FSList &fslist, DescMap &fileMD5Map, int depth, const char **globs) { +static void composeFileHashMap(DescMap &fileMD5Map, const Common::FSList &fslist, int depth, const char **globs) { if (depth <= 0) return; @@ -459,9 +459,8 @@ static void composeFileHashMap(const Common::FSList &fslist, DescMap &fileMD5Map continue; Common::FSList files; - if (file->getChildren(files, Common::FSNode::kListAll)) { - composeFileHashMap(files, fileMD5Map, depth - 1, globs); + composeFileHashMap(fileMD5Map, files, depth - 1, globs); } } } @@ -472,7 +471,7 @@ static void detectGames(const Common::FSList &fslist, Common::Listgameid; ++gfp) { diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index b965e616f1..72a338664b 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -117,10 +117,6 @@ public: return desc != 0; } -// virtual const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { -// return 0; -// } - static Common::String generateGameStateFileName(const char *target, int slot) { return Common::String::format("%s.%02d", target, slot); } diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 6a221da0eb..9c52305a1c 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -89,7 +89,7 @@ public: } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; - const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; + const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; @@ -175,7 +175,7 @@ typedef Common::Array ADGameDescList; * Fallback detection scans the list of Discworld 2 targets to see if it can detect an installation * where the files haven't been renamed (i.e. don't have the '1' just before the extension) */ -const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList &fslist) const { +const ADGameDescription *TinselMetaEngine::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const { Common::String extra; FileMap allFiles; SizeMD5Map filesSizeMD5; diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index d7d829e1da..4a3313e3f7 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -145,7 +145,7 @@ public: return desc != 0; } - virtual const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { for (Common::FSList::const_iterator d = fslist.begin(); d != fslist.end(); ++d) { Common::FSList audiofslist; if (d->isDirectory() && d->getName().equalsIgnoreCase("audio") && d->getChildren(audiofslist, Common::FSNode::kListFilesOnly)) { -- cgit v1.2.3 From 01f806c2dbd06d42c8e56b0a46493cf5d5a68a11 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 18:11:14 +0200 Subject: DETECTOR: Treat file based fallback like any other fallback method --- engines/advancedDetector.cpp | 10 ++-------- engines/advancedDetector.h | 17 +++-------------- engines/gob/detection.cpp | 5 ++++- engines/mohawk/detection.cpp | 6 +++++- engines/toon/detection.cpp | 6 +++++- engines/touche/detection.cpp | 6 +++++- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index c9f4f38b77..82efb0d840 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -472,24 +472,19 @@ ADGameDescList AdvancedMetaEngine::detectGame(const Common::FSNode &parent, cons } // Filename based fallback - if (_fileBasedFallback != 0) { - g = detectGameFilebased(allFiles); - if (g) - matched.push_back(g); - } } return matched; } -const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles) const { +const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap &allFiles, const ADFileBasedFallback *fileBasedFallback) const { const ADFileBasedFallback *ptr; const char* const* filenames; int maxNumMatchedFiles = 0; const ADGameDescription *matchedDesc = 0; - for (ptr = _fileBasedFallback; ptr->desc; ++ptr) { + for (ptr = fileBasedFallback; ptr->desc; ++ptr) { const ADGameDescription *agdesc = (const ADGameDescription *)ptr->desc; int numMatchedFiles = 0; bool fileMissing = false; @@ -566,7 +561,6 @@ AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, con _md5Bytes = 5000; _singleid = NULL; - _fileBasedFallback = NULL; _flags = 0; _guioptions = Common::GUIO_NONE; _maxScanDepth = 1; diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index c48e4a9815..300ce7bbb5 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -172,16 +172,6 @@ protected: */ const char *_singleid; - /** - * List of files for file-based fallback detection (optional). - * This is used if the regular MD5 based detection failed to - * detect anything. - * As usual this list is terminated by an all-zero entry. - * - * @todo Properly explain this - */ - const ADFileBasedFallback *_fileBasedFallback; - /** * A bitmask of flags which can be used to configure the behavior * of the AdvancedDetector. Refer to ADFlags for a list of flags @@ -234,8 +224,7 @@ protected: /** * An (optional) generic fallback detect function which is invoked - * if both the regular MD5 based detection as well as the file - * based fallback failed to detect anything. + * if the regular MD5 based detection failed to detect anything. */ virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { return 0; @@ -256,7 +245,7 @@ protected: ADGameDescList detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const; /** - * Iterates over all ADFileBasedFallback records inside _fileBasedFallback. + * Iterates over all ADFileBasedFallback records inside fileBasedFallback. * This then returns the record (or rather, the ADGameDescription * contained in it) for which all files described by it are present, and * among those the one with the maximal number of matching files. @@ -265,7 +254,7 @@ protected: * @param allFiles a map describing all present files * @param fileBasedFallback a list of ADFileBasedFallback records, zero-terminated */ - const ADGameDescription *detectGameFilebased(const FileMap &allFiles) const; + const ADGameDescription *detectGameFilebased(const FileMap &allFiles, const ADFileBasedFallback *fileBasedFallback) const; // TODO void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const; diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 2050539d60..9a554b5429 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -91,7 +91,6 @@ class GobMetaEngine : public AdvancedMetaEngine { public: GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { _singleid = "gob"; - _fileBasedFallback = Gob::fileBased; _guioptions = Common::GUIO_NOLAUNCHLOAD; } @@ -99,6 +98,10 @@ public: return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); } + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + return detectGameFilebased(allFiles, Gob::fileBased); + } + virtual const char *getName() const { return "Gob"; } diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index e6f60e3cb5..f0c657897d 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -162,10 +162,14 @@ class MohawkMetaEngine : public AdvancedMetaEngine { public: MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) { _singleid = "mohawk"; - _fileBasedFallback = Mohawk::fileBased; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } + + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + return detectGameFilebased(allFiles, Mohawk::fileBased); + } + virtual const char *getName() const { return "Mohawk"; } diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index e72c61ac68..810a37720a 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -121,10 +121,14 @@ class ToonMetaEngine : public AdvancedMetaEngine { public: ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { _singleid = "toon"; - _fileBasedFallback = Toon::fileBasedFallback; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } + + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + return detectGameFilebased(allFiles, Toon::fileBasedFallback); + } + virtual const char *getName() const { return "Toon"; } diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index d1dde96f59..723fecec3a 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -131,11 +131,15 @@ public: ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { _md5Bytes = 4096; _singleid = "touche"; - _fileBasedFallback = Touche::fileBasedFallback; _flags = kADFlagPrintWarningOnFileBasedFallback; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } + + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + return detectGameFilebased(allFiles, Touche::fileBasedFallback); + } + virtual const char *getName() const { return "Touche"; } -- cgit v1.2.3 From 5016645345630e485be55d005ba4bb7cd1e4b589 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 18:15:47 +0200 Subject: DETECTOR: Remove kADFlagPrintWarningOnFileBasedFallback --- engines/advancedDetector.cpp | 13 ------------- engines/advancedDetector.h | 8 +++----- engines/touche/detection.cpp | 17 +++++++++++++++-- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 82efb0d840..db2f404f5f 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -511,19 +511,6 @@ const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap & } } - if (matchedDesc) { // We got a match - if (_flags & kADFlagPrintWarningOnFileBasedFallback) { - Common::String report = Common::String::format(_("Your game version has been detected using " - "filename matching as a variant of %s."), matchedDesc->gameid); - report += "\n"; - report += _("If this is an original and unmodified version, please report any"); - report += "\n"; - report += _("information previously printed by ScummVM to the team."); - report += "\n"; - g_system->logMessage(LogMessageType::kInfo, report.c_str()); - } - } - return matchedDesc; } diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 300ce7bbb5..13fb4b3fb6 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -116,17 +116,15 @@ struct ADFileBasedFallback { enum ADFlags { - /** - * Warn user about new variant if his version was detected with fallback - */ - kADFlagPrintWarningOnFileBasedFallback = (1 << 1), /** * Store value of extra field in config file, and use it as a hint * on subsequent runs. Could be used when there is no way to autodetect * game (when more than one game sits in same directory), and user picks * up a variant manually. + * In addition, this is useful if two variants of a game sharing the same + * gameid are contained in a single directory. */ - kADFlagUseExtraAsHint = (1 << 2) + kADFlagUseExtraAsHint = (1 << 0) }; diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 723fecec3a..0684144473 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -24,6 +24,7 @@ #include "engines/advancedDetector.h" #include "common/savefile.h" #include "common/system.h" +#include "common/translation.h" #include "base/plugins.h" @@ -131,13 +132,25 @@ public: ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { _md5Bytes = 4096; _singleid = "touche"; - _flags = kADFlagPrintWarningOnFileBasedFallback; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { - return detectGameFilebased(allFiles, Touche::fileBasedFallback); + const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, Touche::fileBasedFallback); + + if (matchedDesc) { // We got a match + Common::String report = Common::String::format(_("Your game version has been detected using " + "filename matching as a variant of %s."), matchedDesc->gameid); + report += "\n"; + report += _("If this is an original and unmodified version, please report any"); + report += "\n"; + report += _("information previously printed by ScummVM to the team."); + report += "\n"; + g_system->logMessage(LogMessageType::kInfo, report.c_str()); + } + + return matchedDesc; } virtual const char *getName() const { -- cgit v1.2.3 From d9a996e6ef9cc9ae493075b02bc7c2ddbd918fdc Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Jun 2011 18:21:44 +0200 Subject: DETECTOR: Change ADFileBasedFallback::desc to ADGameDescription pointer --- engines/advancedDetector.cpp | 2 +- engines/advancedDetector.h | 2 +- engines/gob/detection_tables.h | 52 +++++++++++++++++++-------------------- engines/mohawk/detection_tables.h | 10 ++++---- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index db2f404f5f..7ae4d7718a 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -485,7 +485,7 @@ const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap & const ADGameDescription *matchedDesc = 0; for (ptr = fileBasedFallback; ptr->desc; ++ptr) { - const ADGameDescription *agdesc = (const ADGameDescription *)ptr->desc; + const ADGameDescription *agdesc = ptr->desc; int numMatchedFiles = 0; bool fileMissing = false; diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 13fb4b3fb6..5360d23ac1 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -105,7 +105,7 @@ struct ADFileBasedFallback { * Pointer to an ADGameDescription or subclass thereof which will get * returned if there's a detection match. */ - const void *desc; + const ADGameDescription *desc; /** * A zero-terminated list of filenames used for matching. All files in diff --git a/engines/gob/detection_tables.h b/engines/gob/detection_tables.h index 11cca2b65e..1c9811fe9e 100644 --- a/engines/gob/detection_tables.h +++ b/engines/gob/detection_tables.h @@ -5202,32 +5202,32 @@ static const GOBGameDescription fallbackDescs[] = { }; static const ADFileBasedFallback fileBased[] = { - { &fallbackDescs[ 0], { "intro.stk", "disk1.stk", "disk2.stk", "disk3.stk", "disk4.stk", 0 } }, - { &fallbackDescs[ 1], { "intro.stk", "gob.lic", 0 } }, - { &fallbackDescs[ 2], { "intro.stk", 0 } }, - { &fallbackDescs[ 2], { "intro.stk", "disk2.stk", "disk3.stk", 0 } }, - { &fallbackDescs[ 3], { "intro.stk", "disk2.stk", "disk3.stk", "musmac1.mid", 0 } }, - { &fallbackDescs[ 4], { "intro.stk", "gobnew.lic", 0 } }, - { &fallbackDescs[ 5], { "intro.stk", "scaa.imd", "scba.imd", "scbf.imd", 0 } }, - { &fallbackDescs[ 6], { "intro.stk", "imd.itk", 0 } }, - { &fallbackDescs[ 7], { "intro.stk", "mus_gob3.lic", 0 } }, - { &fallbackDescs[ 8], { "intro.stk", "woodruff.itk", 0 } }, - { &fallbackDescs[ 9], { "intro.stk", "commun1.itk", 0 } }, - { &fallbackDescs[10], { "intro.stk", "commun1.itk", "musmac1.mid", 0 } }, - { &fallbackDescs[11], { "intro.stk", "commun1.itk", "lost.lic", 0 } }, - { &fallbackDescs[12], { "intro.stk", "cd1.itk", "objet1.itk", 0 } }, - { &fallbackDescs[13], { "playtoon.stk", "archi.stk", 0 } }, - { &fallbackDescs[14], { "playtoon.stk", "spirou.stk", 0 } }, - { &fallbackDescs[15], { "playtoon.stk", "chato.stk", 0 } }, - { &fallbackDescs[16], { "playtoon.stk", "manda.stk", 0 } }, - { &fallbackDescs[17], { "playtoon.stk", "wakan.stk", 0 } }, - { &fallbackDescs[18], { "playtoon.stk", "dan.itk" } }, - { &fallbackDescs[19], { "intro.stk", "bambou.itk", 0 } }, - { &fallbackDescs[20], { "disk0.stk", "disk1.stk", "disk2.stk", "disk3.stk", 0 } }, - { &fallbackDescs[21], { "disk1.stk", "disk2.stk", "disk3.stk", 0 } }, - { &fallbackDescs[22], { "adi2.stk", 0 } }, - { &fallbackDescs[23], { "adif41.stk", "adim41.stk", 0 } }, - { &fallbackDescs[24], { "coktelplayer.scn", 0 } }, + { &fallbackDescs[ 0].desc, { "intro.stk", "disk1.stk", "disk2.stk", "disk3.stk", "disk4.stk", 0 } }, + { &fallbackDescs[ 1].desc, { "intro.stk", "gob.lic", 0 } }, + { &fallbackDescs[ 2].desc, { "intro.stk", 0 } }, + { &fallbackDescs[ 2].desc, { "intro.stk", "disk2.stk", "disk3.stk", 0 } }, + { &fallbackDescs[ 3].desc, { "intro.stk", "disk2.stk", "disk3.stk", "musmac1.mid", 0 } }, + { &fallbackDescs[ 4].desc, { "intro.stk", "gobnew.lic", 0 } }, + { &fallbackDescs[ 5].desc, { "intro.stk", "scaa.imd", "scba.imd", "scbf.imd", 0 } }, + { &fallbackDescs[ 6].desc, { "intro.stk", "imd.itk", 0 } }, + { &fallbackDescs[ 7].desc, { "intro.stk", "mus_gob3.lic", 0 } }, + { &fallbackDescs[ 8].desc, { "intro.stk", "woodruff.itk", 0 } }, + { &fallbackDescs[ 9].desc, { "intro.stk", "commun1.itk", 0 } }, + { &fallbackDescs[10].desc, { "intro.stk", "commun1.itk", "musmac1.mid", 0 } }, + { &fallbackDescs[11].desc, { "intro.stk", "commun1.itk", "lost.lic", 0 } }, + { &fallbackDescs[12].desc, { "intro.stk", "cd1.itk", "objet1.itk", 0 } }, + { &fallbackDescs[13].desc, { "playtoon.stk", "archi.stk", 0 } }, + { &fallbackDescs[14].desc, { "playtoon.stk", "spirou.stk", 0 } }, + { &fallbackDescs[15].desc, { "playtoon.stk", "chato.stk", 0 } }, + { &fallbackDescs[16].desc, { "playtoon.stk", "manda.stk", 0 } }, + { &fallbackDescs[17].desc, { "playtoon.stk", "wakan.stk", 0 } }, + { &fallbackDescs[18].desc, { "playtoon.stk", "dan.itk" } }, + { &fallbackDescs[19].desc, { "intro.stk", "bambou.itk", 0 } }, + { &fallbackDescs[20].desc, { "disk0.stk", "disk1.stk", "disk2.stk", "disk3.stk", 0 } }, + { &fallbackDescs[21].desc, { "disk1.stk", "disk2.stk", "disk3.stk", 0 } }, + { &fallbackDescs[22].desc, { "adi2.stk", 0 } }, + { &fallbackDescs[23].desc, { "adif41.stk", "adim41.stk", 0 } }, + { &fallbackDescs[24].desc, { "coktelplayer.scn", 0 } }, { 0, { 0 } } }; diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h index df66c3dc1c..2cf80377f6 100644 --- a/engines/mohawk/detection_tables.h +++ b/engines/mohawk/detection_tables.h @@ -2220,11 +2220,11 @@ static const MohawkGameDescription fallbackDescs[] = { }; static const ADFileBasedFallback fileBased[] = { - { &fallbackDescs[0], { "MYST.DAT", 0 } }, - { &fallbackDescs[1], { "MAKING.DAT", 0 } }, - { &fallbackDescs[2], { "MYST.DAT", "Help.dat", 0 } }, // Help system doesn't exist in original - { &fallbackDescs[3], { "a_Data.MHK", 0 } }, - { &fallbackDescs[4], { "a_Data.MHK", "t_Data1.MHK" , 0 } }, + { &fallbackDescs[0].desc, { "MYST.DAT", 0 } }, + { &fallbackDescs[1].desc, { "MAKING.DAT", 0 } }, + { &fallbackDescs[2].desc, { "MYST.DAT", "Help.dat", 0 } }, // Help system doesn't exist in original + { &fallbackDescs[3].desc, { "a_Data.MHK", 0 } }, + { &fallbackDescs[4].desc, { "a_Data.MHK", "t_Data1.MHK" , 0 } }, { 0, { 0 } } }; -- cgit v1.2.3 From e826aaab39f02360c5fa8f249ec6b788a903b948 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Tue, 14 Jun 2011 21:10:35 +0100 Subject: I18N: Update Czech translation from patch #3316238 --- gui/themes/translations.dat | Bin 206325 -> 212190 bytes po/cs_CZ.po | 145 +++++++++++++++++++++++++------------------- 2 files changed, 82 insertions(+), 63 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index eb6cf3223f..9e5c0465d9 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ diff --git a/po/cs_CZ.po b/po/cs_CZ.po index b87fe54a2f..6a570b81c2 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2011-06-13 22:20+0100\n" -"PO-Revision-Date: 2011-06-07 16:23+0100\n" +"PO-Revision-Date: 2011-06-14 15:04+0100\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1185,6 +1185,9 @@ msgid "" "the README for basic information, and for instructions on how to obtain " "further assistance." msgstr "" +"Je nám líto, ale toto jádro v současnosti nepodporuje herní nápovědu. Prosím " +"prohlédněte si README pro základní informace a pro instrukce jak získat " +"další pomoc." #: engines/dialogs.cpp:312 engines/mohawk/dialogs.cpp:100 #: engines/mohawk/dialogs.cpp:152 @@ -1202,21 +1205,19 @@ msgstr "~K~l #: engines/engine.cpp:220 msgid "Could not initialize color format." -msgstr "" +msgstr "Nelze zavést barevný formát." #: engines/engine.cpp:228 -#, fuzzy msgid "Could not switch to video mode: '" -msgstr "Současný režim obrazu:" +msgstr "Nelze přepnout na režim obrazu: '" #: engines/engine.cpp:237 -#, fuzzy msgid "Could not apply aspect ratio setting." -msgstr "Povolena korekce poměru stran" +msgstr "Nelze použít nastavení poměru stran." #: engines/engine.cpp:242 msgid "Could not apply fullscreen setting." -msgstr "" +msgstr "Nelze použít nastavení celé obrazovky." #: engines/engine.cpp:342 msgid "" @@ -1226,6 +1227,11 @@ msgid "" "the data files to your hard disk instead.\n" "See the README file for details." msgstr "" +"Vypadá to, že tuto hru hrajete přímo z\n" +" CD. Je známo, že toto způsobuje problémy\n" +" a je tedy doporučeno, ať místo toho zkopírujete\n" +"datové soubory na Váš pevný disk.\n" +"Pro podrobnosti si přečtěte README." #: engines/engine.cpp:353 msgid "" @@ -1235,6 +1241,11 @@ msgid "" "order to listen to the game's music.\n" "See the README file for details." msgstr "" +"Tato hra má na svém disku zvukové stopy. Tyto\n" +"stopy musí být z disku zkopírovány použitím\n" +"vhodného nástroje pro extrakci zvuku z CD,\n" +"abyste mohli poslouchat hudbu ve hře.\n" +"Pro podrobnosti si přečtěte README." #: engines/scumm/dialogs.cpp:281 msgid "~P~revious" @@ -1774,6 +1785,8 @@ msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" +"Přirozená podpora MIDI vyžaduje Aktualizaci Roland od LucasArts,\n" +"ale %s chybí. Místo toho je použit AdLib." #: engines/scumm/scumm.cpp:2256 engines/agos/saveload.cpp:190 #, c-format @@ -1849,40 +1862,24 @@ msgstr "Obnovit" #: engines/agos/animation.cpp:544 #, c-format msgid "Cutscene file '%s' not found!" -msgstr "" +msgstr "Soubor videa '%s' nenalezen'" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 #: engines/tinsel/saveload.cpp:468 -#, fuzzy msgid "Failed to load game state from file." -msgstr "" -"Nahrání stavu hry selhalo ze souboru:\n" -"\n" -"%s" +msgstr "Nelze načíst stav hry ze souboru." #: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:546 -#, fuzzy msgid "Failed to save game state to file." -msgstr "" -"Uložení stavu hry selhalo do souboru:\n" -"\n" -"%s" +msgstr "Nelze uložit stav hry do souboru." #: engines/gob/inter_v5.cpp:107 -#, fuzzy msgid "Failed to delete file." -msgstr "" -"Uložení stavu hry selhalo do souboru:\n" -"\n" -"%s" +msgstr "Nelze smazat soubor." #: engines/groovie/script.cpp:417 -#, fuzzy msgid "Failed to save game" -msgstr "" -"Uložení stavu hry selhalo do souboru:\n" -"\n" -"%s" +msgstr "Nelze uložit hru." #: engines/kyra/sound_midi.cpp:475 msgid "" @@ -1892,36 +1889,44 @@ msgid "" "General MIDI ones. After all it might happen\n" "that a few tracks will not be correctly played." msgstr "" +"Zdá se, že používáte zařízení General MIDI,\n" +"ale Vaše hra podporuje pouze Roland MT32 MIDI.\n" +"Snažíme se mapovat nástroje Roland MT32 na\n" +"ty od General MIDI. Po tomto se může stát,\n" +"že pár stop nebude správně přehráno." #: engines/m4/m4_menus.cpp:138 -#, fuzzy msgid "Save game failed!" -msgstr "Uložit hru:" +msgstr "Ukládání hry selhalo!" #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" "Please download it from www.scummvm.org" msgstr "" +"Nelze nalézt soubor \"sky.cpt\"!\n" +"Stáhněte si ho, prosím z www.scummvm.org" #: engines/sky/compact.cpp:141 msgid "" "The \"sky.cpt\" file has an incorrect size.\n" "Please (re)download it from www.scummvm.org" msgstr "" +"Soubor \"sky.cpt\" má nesprávnou velikost.\n" +"Stáhněte si ho, prosím, (znovu) z www.scummvm.org" #: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 msgid "DXA cutscenes found but ScummVM has been built without zlib support" -msgstr "" +msgstr "Videa DXA nalezena, ale ScummVM byl sestaven bez podpory zlib" #: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 msgid "MPEG2 cutscenes are no longer supported" -msgstr "" +msgstr "Videa MPGE2 již nejsou podporována" #: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 #, c-format msgid "Cutscene '%s' not found" -msgstr "" +msgstr "Video '%s' nenalezeno" #: engines/sword1/control.cpp:863 msgid "" @@ -1933,6 +1938,13 @@ msgid "" "Press OK to convert them now, otherwise you will be asked again the next " "time you start the game.\n" msgstr "" +"ScummVM zjistil, že máte staré uložené pozice pro Broken Sword 1, které by " +"měly být převedeny.\n" +"Starý formát uložených her již není podporován, takže pokud je nepřevedete, " +"nebudete moci Vaše hry načíst.\n" +"\n" +"Stiskněte OK, abyste je převedli teď, jinak budete požádáni znovu, při " +"spuštění této hry.\n" #: engines/sword1/control.cpp:1232 #, c-format @@ -1940,18 +1952,20 @@ msgid "" "Target new save game already exists!\n" "Would you like to keep the old save game (%s) or the new one (%s)?\n" msgstr "" +"Nová cílová uložená hra již existuje!\n" +"Chtěli byste ponechat starou uloženou hru (%s), nebo novou (%s)?\n" #: engines/sword1/control.cpp:1235 msgid "Keep the old one" -msgstr "" +msgstr "Ponechat starou" #: engines/sword1/control.cpp:1235 msgid "Keep the new one" -msgstr "" +msgstr "Ponechat novou" #: engines/sword1/logic.cpp:1633 msgid "This is the end of the Broken Sword 1 Demo" -msgstr "" +msgstr "Toto je konec Dema Broken Sword 1" #: engines/parallaction/saveload.cpp:133 #, c-format @@ -1959,16 +1973,16 @@ msgid "" "Can't save game in slot %i\n" "\n" msgstr "" +"Nelze uložit hru do pozice %i\n" +"\n" #: engines/parallaction/saveload.cpp:211 -#, fuzzy msgid "Loading game..." -msgstr "Nahrát hru:" +msgstr "Nahrávání hry..." #: engines/parallaction/saveload.cpp:226 -#, fuzzy msgid "Saving game..." -msgstr "Uložit hru:" +msgstr "Ukládání hry..." #: engines/parallaction/saveload.cpp:279 msgid "" @@ -1979,10 +1993,16 @@ msgid "" "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" +"ScummVM zjistil, že máte staré uložené pozice pro Nippon Safes, které by " +"měly být přejmenovány.\n" +"Staré názvy již nejsou podporovány, takže pokud je nepřevedete, nebudete " +"moci Vaše hry načíst.\n" +"\n" +"Stiskněte OK, abyste je převedli teď, jinak budete požádáni příště.\n" #: engines/parallaction/saveload.cpp:326 msgid "ScummVM successfully converted all your savefiles." -msgstr "" +msgstr "ScummVM úspěšně převedl všechny Vaše uložené pozice. " #: engines/parallaction/saveload.cpp:328 msgid "" @@ -1991,6 +2011,10 @@ msgid "" "\n" "Please report to the team." msgstr "" +"ScummVM vytiskl některá varování ve Vašem okně konzole a nemůže zaručit, že " +"všechny Vaše soubory byly převedeny.\n" +"\n" +"Prosím nahlaste to týmu" #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" @@ -2001,39 +2025,39 @@ msgid "DOSBox OPL emulator" msgstr "DOSBox OPL Emulátor" #: audio/mididrv.cpp:204 -#, fuzzy, c-format +#, c-format msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected). Attempting to fall back to the next available device..." msgstr "" -"Nelze zjistit zvolené zvukové zařízení '%s'. Podívejte se na záznam pro více " -"informací. Pokus o navrácení na nejbližší dostupné zařízení..." +"Zvolené zařízení '%s' nebylo nalezeno (např. může být vypnuto nebo " +"odpojeno). Pokus o navrácení na nejbližší dostupné zařízení..." #: audio/mididrv.cpp:216 -#, fuzzy, c-format +#, c-format msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -"Nelze zjistit zvolené zvukové zařízení '%s'. Podívejte se na záznam pro více " +"Zvolené zařízení '%s' nelze použít.. Podívejte se na záznam pro více " "informací. Pokus o navrácení na nejbližší dostupné zařízení..." #: audio/mididrv.cpp:250 -#, fuzzy, c-format +#, c-format msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected). Attempting to fall back to the next available device..." msgstr "" -"Nelze zjistit upřednostňované zařízení '%s'. Podívejte se na záznam pro více " -"informací. Pokus o navrácení na nejbližší dostupné zařízení..." +"Upřednostňované zařízení '%s' nebylo nalezeno (např. může být vypnuto nebo " +"odpojeno). Pokus o navrácení na nejbližší dostupné zařízení..." #: audio/mididrv.cpp:265 -#, fuzzy, c-format +#, c-format msgid "" "The preferred audio device '%s' cannot be used. See log file for more " "information. Attempting to fall back to the next available device..." msgstr "" -"Nelze zjistit upřednostňované zařízení '%s'. Podívejte se na záznam pro více " +"Upřednostňované zařízení '%s' nelze použít. Podívejte se na záznam pro více " "informací. Pokus o navrácení na nejbližší dostupné zařízení..." #: audio/null.h:43 @@ -2165,14 +2189,12 @@ msgid "Disable power off" msgstr "Zakázat vypnutí" #: backends/platform/iphone/osys_events.cpp:338 -#, fuzzy msgid "Mouse-click-and-drag mode enabled." -msgstr "Touchpad režim zapnut" +msgstr "Režim přetáhnutí myši zapnut." #: backends/platform/iphone/osys_events.cpp:340 -#, fuzzy msgid "Mouse-click-and-drag mode disabled." -msgstr "Touchpad režim vypnut" +msgstr "Režim přetáhnutí myši vypnut." #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." @@ -2310,7 +2332,7 @@ msgstr "Mapova #: backends/events/symbiansdl/symbiansdl-events.cpp:184 msgid "Do you want to quit ?" -msgstr "Chcete ukončit?" +msgstr "Chcete ukončit ?" #: backends/platform/wii/options.cpp:51 msgid "Video" @@ -2522,7 +2544,7 @@ msgstr "Displej" #: backends/platform/wince/CELauncherDialog.cpp:77 msgid "Do you want to perform an automatic scan ?" -msgstr "Chcete provést automatické hledání?" +msgstr "Chcete provést automatické hledání ?" #: backends/platform/wince/wince-sdl.cpp:487 msgid "Map right click action" @@ -2560,19 +2582,16 @@ msgstr "" "viděli celý inventář" #: backends/events/default/default-events.cpp:222 -#, fuzzy msgid "Do you really want to return to the Launcher?" -msgstr "Opravdu chcete tuto uloženou hru vymazat" +msgstr "Opravdu se chcete vrátit tuto do Spouštěče?" #: backends/events/default/default-events.cpp:222 -#, fuzzy msgid "Launcher" -msgstr "Udeřit" +msgstr "Spouštěč" #: backends/events/default/default-events.cpp:244 -#, fuzzy msgid "Do you really want to quit?" -msgstr "Chcete ukončit?" +msgstr "Opravdu chcete skončit?" #: backends/events/gph/gph-events.cpp:366 #: backends/events/gph/gph-events.cpp:409 -- cgit v1.2.3