diff options
113 files changed, 2892 insertions, 1465 deletions
@@ -3,6 +3,13 @@ For a more comprehensive changelog of the latest experimental code, see: 1.8.0 (????-??-??) +Broken Sword 1: + - Fix speech endianness detection on big endian systems for the mac + version (bug #6720). + - Fix crash when reloading a game from the Main Menu while in the bull's + head scene (bug #6728). It may have been happening in other scenes as + well. + 1.7.0 (2014-07-21) New Games: - Added support for Chivalry is Not Dead. diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 5a66cdaa2f..2cf397492a 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -62,7 +62,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode() { _bIsDirectory = true; _sPath = ""; _pFileLock = 0; - _nProt = 0; // protection is ignored for the root volume + _nProt = 0; // Protection is ignored for the root volume LEAVE(); } @@ -84,7 +84,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) { _bIsDirectory = false; _bIsValid = false; - // Check whether the node exists and if it is a directory + // Check whether the node exists and if it's a directory struct ExamineData * pExd = IDOS->ExamineObjectTags(EX_StringNameInput,_sPath.c_str(),TAG_END); if (pExd) { _nProt = pExd->Protection; @@ -93,7 +93,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) { _pFileLock = IDOS->Lock((CONST_STRPTR)_sPath.c_str(), SHARED_LOCK); _bIsValid = (_pFileLock != 0); - // Add a trailing slash if it is needed + // Add a trailing slash if needed const char c = _sPath.lastChar(); if (c != '/' && c != ':') _sPath += '/'; @@ -134,7 +134,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam delete[] n; } - _bIsValid = false; + _bIsValid = false; _bIsDirectory = false; struct ExamineData * pExd = IDOS->ExamineObjectTags(EX_FileLockInput,pLock,TAG_END); @@ -188,10 +188,10 @@ bool AmigaOSFilesystemNode::exists() const { bool nodeExists = false; - // previously we were trying to examine the node in order + // Previously we were trying to examine the node in order // to determine if the node exists or not. // I don't see the point : once you have been granted a - // lock on it then it means it exists... + // lock on it, it means it exists... // // ============================= Old code // BPTR pLock = IDOS->Lock((STRPTR)_sPath.c_str(), SHARED_LOCK); @@ -237,8 +237,8 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b ENTER(); bool ret = false; - //TODO: honor the hidden flag - // There is nothing like a hidden flag under AmigaOS... + // TODO: Honor the hidden flag + // There is no such thing as a hidden flag in AmigaOS... if (!_bIsValid) { debug(6, "Invalid node"); @@ -264,7 +264,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b EX_DataFields, (EXF_NAME|EXF_LINK|EXF_TYPE), TAG_END); if (context) { - struct ExamineData * pExd = NULL; // NB: no need to free value after usage, all is dealt by the DirContext release + struct ExamineData * pExd = NULL; // NB: No need to free the value after usage, everything will be dealt with by the DirContext release AmigaOSFilesystemNode *entry ; while ( (pExd = IDOS->ExamineDir(context)) ) { @@ -332,8 +332,8 @@ bool AmigaOSFilesystemNode::isReadable() const { return false; // Regular RWED protection flags are low-active or inverted, thus the negation. - // moreover pseudo root filesystem (null _pFileLock) is readable whatever the - // protection says + // Moreover, a pseudo root filesystem (null _pFileLock) is readable whatever the + // protection says. bool readable = !(_nProt & EXDF_OTR_READ) || _pFileLock == 0; return readable; @@ -344,8 +344,8 @@ bool AmigaOSFilesystemNode::isWritable() const { return false; // Regular RWED protection flags are low-active or inverted, thus the negation. - // moreover pseudo root filesystem (null _pFileLock) is never writable whatever - // the protection says (because of the pseudo nature) + // Moreover, a pseudo root filesystem (null _pFileLock) is never writable whatever + // the protection says (Because of it's pseudo nature). bool writable = !(_nProt & EXDF_OTR_WRITE) && _pFileLock !=0; return writable; @@ -371,12 +371,13 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const { if (dosList->dol_Type == DLT_VOLUME && dosList->dol_Name) { - // Original was - // dosList->dol_Name && - // dosList->dol_Task) { + // The original line was + //if (dosList->dol_Type == DLT_VOLUME && + //dosList->dol_Name && + //dosList->dol_Task) { // which errored using SDK 53.24 with a 'struct dosList' has no member called 'dol_Task' // I removed dol_Task because it's not used anywhere else - // and it neither brought up further errors nor crashes or regressions. + // and it neither brought up further errors nor crashes or regressions // Copy name to buffer IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN); @@ -410,7 +411,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const { delete[] volName; } - dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES); + dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES); } IDOS->UnLockDosList(kLockFlags); diff --git a/backends/fs/amigaos4/amigaos4-fs.h b/backends/fs/amigaos4/amigaos4-fs.h index bbe88b2716..223d809032 100644 --- a/backends/fs/amigaos4/amigaos4-fs.h +++ b/backends/fs/amigaos4/amigaos4-fs.h @@ -76,19 +76,19 @@ public: AmigaOSFilesystemNode(const Common::String &p); /** - * Creates an AmigaOSFilesystemNode given its lock and display name + * Creates an AmigaOSFilesystemNode given its lock and display name. * * @param pLock BPTR to the lock. * @param pDisplayName name to be used for display, in case not supplied the FilePart() of the filename will be used. * - * @note This shouldn't even be public as it's only internally, at best it should have been protected if not private + * @note This shouldn't even be public as it's only internally, at best it should have been protected if not private. */ AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayName = 0); /** * Copy constructor. * - * @note Needed because it duplicates the file lock + * @note Needed because it duplicates the file lock. */ AmigaOSFilesystemNode(const AmigaOSFilesystemNode &node); diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk index e998c6f3b2..5cec9c1588 100644 --- a/backends/platform/sdl/amigaos/amigaos.mk +++ b/backends/platform/sdl/amigaos/amigaos.mk @@ -4,6 +4,7 @@ amigaosdist: $(EXECUTABLE) mkdir -p $(AMIGAOSPATH)/themes mkdir -p $(AMIGAOSPATH)/extras $(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE) + cp ${srcdir}/icons/scummvm_drawer.info $(AMIGAOSPATH).info cp ${srcdir}/icons/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info cp $(DIST_FILES_THEMES) $(AMIGAOSPATH)/themes/ ifdef DIST_FILES_ENGINEDATA diff --git a/backends/platform/symbian/help/ScummVM.rtf b/backends/platform/symbian/help/ScummVM.rtf index 25254f5338..8e9d37363c 100644 --- a/backends/platform/symbian/help/ScummVM.rtf +++ b/backends/platform/symbian/help/ScummVM.rtf @@ -50,16 +50,16 @@ Synonyms;}{\*\cs33 \additive \super \sbasedon10 endnote reference;}{\s34\ql \fi- {\listoverride\listid-119\listoverridecount0\ls7}{\listoverride\listid-125\listoverridecount0\ls8}{\listoverride\listid-120\listoverridecount0\ls9}{\listoverride\listid-129\listoverridecount0\ls10}{\listoverride\listid-119\listoverridecount0\ls11} {\listoverride\listid-125\listoverridecount0\ls12}{\listoverride\listid-120\listoverridecount0\ls13}{\listoverride\listid-129\listoverridecount0\ls14}{\listoverride\listid-119\listoverridecount0\ls15}{\listoverride\listid-125\listoverridecount0\ls16} {\listoverride\listid-120\listoverridecount0\ls17}{\listoverride\listid-129\listoverridecount0\ls18}{\listoverride\listid-119\listoverridecount0\ls19}{\listoverride\listid-125\listoverridecount0\ls20}{\listoverride\listid-120\listoverridecount0\ls21} -{\listoverride\listid-129\listoverridecount0\ls22}{\listoverride\listid-119\listoverridecount0\ls23}{\listoverride\listid-125\listoverridecount0\ls24}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23 -\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls25}{\listoverride\listid-2 -\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 -\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls26}}{\info{\author Fedor}{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo7\dy2\hr12\min57}{\version98}{\edmins92}{\nofpages8}{\nofwords1514}{\nofchars8634}{\*\company DEV} -{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 \deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3 -\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1 -\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5 -\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 { -\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 +{\listoverride\listid-129\listoverridecount0\ls22}{\listoverride\listid-119\listoverridecount0\ls23}{\listoverride\listid-125\listoverridecount0\ls24}{\listoverride\listid-120\listoverridecount0\ls25}{\listoverride\listid-129\listoverridecount0\ls26} +{\listoverride\listid-119\listoverridecount0\ls27}{\listoverride\listid-125\listoverridecount0\ls28}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls29}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel +\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls30}}{\info{\author Fedor} +{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo9\dy9\hr19\min22}{\version99}{\edmins93}{\nofpages8}{\nofwords1514}{\nofchars8634}{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 +\deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template +E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang +{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang +{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain +\s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 \par }{\lang1033\langfe1033\langnp1033 Date: November 2013}{\f28 \par }{\lang1033\langfe1033\langnp1033 Version: 1.7.0 \par }\pard\plain \s1\ql \li0\ri0\sb360\sa240\keepn\widctlpar\nooverflow\faroman\outlinelevel0\rin0\lin0\itap0 \b\f1\fs32\lang2057\langfe1033\kerning28\cgrid\langnp2057\langfenp1033 {ScummVM Help @@ -67,8 +67,8 @@ Synonyms;}{\*\cs33 \additive \super \sbasedon10 endnote reference;}{\s34\ql \fi- \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 About ScummVM Help -\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls25\pnrnot0 -\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls25\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help +\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0 +\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 \par }{ This help file based on ScummVM forum thread with some elaborations(in Anotherguest section) and text correction. If you wish add some text or translate you may download and modify source document from https://sourceforge.net/projects/scummvms60git/ and t @@ -79,8 +79,8 @@ hen send me to fedor_qd@mail.ru \par }{\f29 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 1st guide -\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls25\pnrnot0 -\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls25\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90 +\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0 +\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 \par }{UIQ3 devices: To the top right (holding the phone portrait) you four icons, from the top they are \par @@ -121,9 +121,9 @@ hen send me to fedor_qd@mail.ru \par \par What are these Joystick, Keyboard and Cursor modes anyway? \par }{\f28 -\par }{Joystick mode sends SDL joystick events to ScummVM which acts as a mouse control in ScummVM. Cursor mode sends keyboard arrows instead, so for examp -le it can be used to navigate through directorylist (one hand use perhaps!?) or save games etc. Keyboard mode is only available for S60 and enables multi-tap to enter text characters in save dialogs. These modes are implemented at the underlying SDL level -, so this determines the types of events that ScummVM receives from SDL. +\par }{Joystick mode sends SDL joystick events to ScummVM which acts as a mouse control in ScummVM. Cursor mode sends keyboard arrows instead, so for example it can be used to navigate +through directorylist (one hand use perhaps!?) or save games etc. Keyboard mode is only available for S60 and enables multi-tap to enter text characters in save dialogs. These modes are implemented at the underlying SDL level, so this determines the types + of events that ScummVM receives from SDL. \par What are these Shrinked, Zoomed and Upscaled modes anyway? \par \par Shrink displays the game on your screen but in a shrinked way, either in Portrait or Landscape mode, so not all the pixels c @@ -135,8 +135,8 @@ s on S80/S90 devices in a better way for low resolution games. Currently it uses \par \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 2nd guide -\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls25\pnrnot0 -\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls25\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60 +\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0 +\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 \par \par }{More user-friendly guide for Nokia phones (based on N96 but should apply to most phones) @@ -178,8 +178,8 @@ t to exit Configuration Mode before typing! \par Only applies to Landscape mode, simply swaps the screen output between having the phone tilted on its left side or on its right side. \par \par 4 - Toggle Zoom On and Off -\par Zooms in on a portion of the screen. Handy for when you are looking through a screen for items or having trouble readin -g subtitles. Use the navigation buttons for panning around the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom level. +\par Zooms in on a portion of the screen. Handy for when you are looking through a screen for items or having trouble reading subtitles. Use the navigation buttons for panning around + the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom level. \par }{\f29 \par }{5 & 6 - Unused \par @@ -200,8 +200,8 @@ g subtitles. Use the navigation buttons for panning around the play area. Don't \par \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 3rd guide -\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls25\pnrnot0 -\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls25\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60 +\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0 +\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 \par \par }{ScummVM keys on Nokia e71 (most likely on any other qwerty-device, too), tested on version 0.14.0svn (Feb. 18 2009 @@ -278,11 +278,12 @@ kinda makes it unplayable. \par }{\f28 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM1 engines list -\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls26\pnrnot0 -\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls26\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines +\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0 +\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {agi \par agos \par \tab AGOS2 +\par cge2 \par cine \par composer \par cruise @@ -311,8 +312,8 @@ kinda makes it unplayable. \par \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM2 engines list -\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls26\pnrnot0 -\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls26\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines +\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0 +\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {avalanche \par cge \par composer diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh index 12c1fc2d2d..075697d99a 100644 --- a/backends/platform/symbian/mmp/config.mmh +++ b/backends/platform/symbian/mmp/config.mmh @@ -48,7 +48,7 @@ OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid l OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings // -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4" OPTION GCCE -pipe -Wno-multichar -Wno-reorder -Wno-unused \ - -Wno-format -fsigned-char-Wno-psabi + -Wno-format -fsigned-char -Wno-psabi ALWAYS_BUILD_AS_ARM // *** Include paths diff --git a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in index 21a674dc1f..ceb5a2124f 100644 --- a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_cruise.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\cruise //STOP_AUTO_OBJECTS_CRUISE_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_draci.mmp.in b/backends/platform/symbian/mmp/scummvm_draci.mmp.in index fe899a91ff..77750ff696 100644 --- a/backends/platform/symbian/mmp/scummvm_draci.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_draci.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_draci.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\draci // *** Include paths -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_drascula.mmp.in b/backends/platform/symbian/mmp/scummvm_drascula.mmp.in index 8f532d4498..7f39126e68 100644 --- a/backends/platform/symbian/mmp/scummvm_drascula.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_drascula.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_drascula.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\drascula // *** Include paths -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in b/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in index 89ffd23ebd..22d5050597 100644 --- a/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in @@ -33,10 +33,7 @@ TARGET scummvm_dreamweb.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -56,17 +53,3 @@ SOURCEPATH ..\..\..\..\engines\dreamweb // *** Include paths -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_gob.mmp.in b/backends/platform/symbian/mmp/scummvm_gob.mmp.in index 884b06c61a..a46ee9c403 100644 --- a/backends/platform/symbian/mmp/scummvm_gob.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_gob.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_gob.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\gob //STOP_AUTO_OBJECTS_GOB_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_groovie.mmp.in b/backends/platform/symbian/mmp/scummvm_groovie.mmp.in index 53fb33fef0..a2a3d5c47d 100644 --- a/backends/platform/symbian/mmp/scummvm_groovie.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_groovie.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_groovie.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\groovie //STOP_AUTO_OBJECTS_GROOVIE_// SOURCE roq.cpp -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in b/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in index bafc11e65f..82728942a7 100644 --- a/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_HOPKINS.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\HOPKINS //STOP_AUTO_OBJECTS_HOPKINS_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h
\ No newline at end of file diff --git a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in index 58622a83fd..1f250bda3f 100644 --- a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_hugo.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\hugo //STOP_AUTO_OBJECTS_HUGO_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h
\ No newline at end of file diff --git a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in index 3fa05e856d..f3b30b1318 100644 --- a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_kyra.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -66,19 +63,3 @@ SOURCEPATH ..\..\..\..\engines\kyra //STOP_AUTO_OBJECTS_KYRA_ENABLE_EOB// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in b/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in index 8e0b3026c7..38d63b4648 100644 --- a/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_lastexpress.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\lastexpress //STOP_AUTO_OBJECTS_LASTEXPRESS_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_lure.mmp.in b/backends/platform/symbian/mmp/scummvm_lure.mmp.in index 89c93d058d..2922c9df49 100644 --- a/backends/platform/symbian/mmp/scummvm_lure.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_lure.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_lure.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\lure //STOP_AUTO_OBJECTS_LURE_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_m4.mmp.in b/backends/platform/symbian/mmp/scummvm_m4.mmp.in index b3024c93c3..0b3a0b60e4 100644 --- a/backends/platform/symbian/mmp/scummvm_m4.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_m4.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_m4.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\m4 //STOP_AUTO_OBJECTS_M4_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_made.mmp.in b/backends/platform/symbian/mmp/scummvm_made.mmp.in index d4a63f8d87..e240685753 100644 --- a/backends/platform/symbian/mmp/scummvm_made.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_made.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_made.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,20 +50,3 @@ SOURCEPATH ..\..\..\..\engines\made //STOP_AUTO_OBJECTS_MADE_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h - diff --git a/backends/platform/symbian/mmp/scummvm_mads.mmp.in b/backends/platform/symbian/mmp/scummvm_mads.mmp.in index d0d6091f83..e5e990dd2d 100644 --- a/backends/platform/symbian/mmp/scummvm_mads.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_mads.mmp.in @@ -33,10 +33,7 @@ TARGET scummvm_mads.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\mads //STOP_AUTO_OBJECTS_MADS_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in b/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in index e9175593ec..19bed823d5 100644 --- a/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_mohawk.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -72,19 +69,3 @@ SOURCEPATH ..\..\..\..\engines\mohawk //STOP_AUTO_OBJECTS_MOHAWK_ENABLE_CSTIME// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in b/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in index f118ddbef0..06f9333c37 100644 --- a/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in @@ -33,10 +33,7 @@ TARGET scummvm_mortevielle.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\mortevielle //STOP_AUTO_OBJECTS_MORTEVIELLE_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in b/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in index a57161577f..b6deeb2d73 100644 --- a/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_neverhood.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\neverhood // *** Include paths -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in b/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in index cefdd1b282..c61e40626c 100644 --- a/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_parallaction.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\parallaction //STOP_AUTO_OBJECTS_PARALLACTION_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in b/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in index 68b2c12774..3ef85bf29d 100644 --- a/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_PEGASUS.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\PEGASUS //STOP_AUTO_OBJECTS_PEGASUS_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h
\ No newline at end of file diff --git a/backends/platform/symbian/mmp/scummvm_queen.mmp.in b/backends/platform/symbian/mmp/scummvm_queen.mmp.in index 94835aae90..3a15fdd0a2 100644 --- a/backends/platform/symbian/mmp/scummvm_queen.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_queen.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_queen.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\queen //STOP_AUTO_OBJECTS_QUEEN_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_saga.mmp.in b/backends/platform/symbian/mmp/scummvm_saga.mmp.in index 77bf839efe..ce5de459b2 100644 --- a/backends/platform/symbian/mmp/scummvm_saga.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_saga.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_saga.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -65,19 +62,3 @@ SOURCEPATH ..\..\..\..\engines\saga //STOP_AUTO_OBJECTS_SAGA_ENABLE_SAGA2// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_sci.mmp.in b/backends/platform/symbian/mmp/scummvm_sci.mmp.in index d08501e471..49484b8c7c 100644 --- a/backends/platform/symbian/mmp/scummvm_sci.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_sci.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_sci.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -60,20 +57,3 @@ SOURCEPATH ..\..\..\..\engines\sci //STOP_AUTO_OBJECTS_SCI_ENABLE_SCI32// - -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in index a11dd071d3..60c54697d0 100644 --- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_scumm.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -78,17 +75,5 @@ SOURCE smush/codec47ARM.s // ARM version: add ASM routines // *** Include paths -USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h +USERINCLUDE ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane + diff --git a/backends/platform/symbian/mmp/scummvm_sky.mmp.in b/backends/platform/symbian/mmp/scummvm_sky.mmp.in index 37fdc89f99..5363bb32ef 100644 --- a/backends/platform/symbian/mmp/scummvm_sky.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_sky.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_sky.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -55,17 +52,5 @@ SOURCEPATH ..\..\..\..\engines\sky // *** Include paths -USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\sky\music -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src +USERINCLUDE ..\..\..\..\engines\sky\music -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in index 352cbe59f0..b4b2b91dae 100644 --- a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_sword1.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\sword1 //STOP_AUTO_OBJECTS_SWORD1_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in index 7b79bf7f5c..a8c963a618 100644 --- a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_sword2.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\sword2 //STOP_AUTO_OBJECTS_SWORD2_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_sword25.mmp.in b/backends/platform/symbian/mmp/scummvm_sword25.mmp.in index 4159350bce..67efc10c45 100644 --- a/backends/platform/symbian/mmp/scummvm_sword25.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_sword25.mmp.in @@ -33,10 +33,7 @@ TARGET scummvm_sword25.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -56,18 +53,6 @@ SOURCEPATH ..\..\..\..\engines\sword25 // *** Include paths -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src -USERINCLUDE ..\..\..\..\engines\sword25\util\lua ..\..\..\..\engines\sword25\util\pluto +USERINCLUDE ..\..\..\..\engines\sword25\util\lua +USERINCLUDE ..\..\..\..\engines\sword25\util\pluto -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in b/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in index 332b9f20ac..9551eda7b6 100644 --- a/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_teenagent.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\teenagent //STOP_AUTO_OBJECTS_TEENAGENT_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h diff --git a/backends/platform/symbian/mmp/scummvm_testbed.mmp.in b/backends/platform/symbian/mmp/scummvm_testbed.mmp.in index 20d3789a31..24b87d154c 100644 --- a/backends/platform/symbian/mmp/scummvm_testbed.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_testbed.mmp.in @@ -33,10 +33,7 @@ TARGET scummvm_testbed.lib TARGETTYPE lib -OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp -OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings -OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\testbed //STOP_AUTO_OBJECTS_TESTBED_// -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -SYSTEMINCLUDE \epoc32\include\freetype -SYSTEMINCLUDE \epoc32\include\mpeg2dec -SYSTEMINCLUDE \epoc32\include\jpeg -SYSTEMINCLUDE \epoc32\include\png -SYSTEMINCLUDE \epoc32\include\ESDL -SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version -SYSTEMINCLUDE \epoc32\include\libc -SYSTEMINCLUDE \epoc32\include\theora -SYSTEMINCLUDE \epoc32\include\tremor -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE ..\src // for portdefs.h @@ -3848,8 +3848,8 @@ if test "$_libunity" = auto ; then ;; *) # Unity has a lots of dependencies, update the libs and cflags var with them - LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs unity = 3.8.4 2>> "$TMPLOG"`" - LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG"`" + LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`" + LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`" _libunity=no cat > $TMPC << EOF #include <unity.h> @@ -3863,6 +3863,10 @@ EOF esac fi if test "$_libunity" = yes ; then + if test "$LIBUNITY_CFLAGS" = "" || test "$LIBUNITY_LIBS" = ""; then + LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`" + LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`" + fi LIBS="$LIBS $LIBUNITY_LIBS" INCLUDES="$INCLUDES $LIBUNITY_CFLAGS" fi diff --git a/engines/cge/POTFILES b/engines/cge/POTFILES new file mode 100644 index 0000000000..55430683c3 --- /dev/null +++ b/engines/cge/POTFILES @@ -0,0 +1,2 @@ +engines/cge/detection.cpp + diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index 022ff4df95..da5eb2b1f2 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -28,35 +28,19 @@ #include "base/plugins.h" #include "graphics/thumbnail.h" #include "cge/cge.h" +#include "cge/fileio.h" namespace CGE { -struct CgeGameDescription { - ADGameDescription desc; -}; - #define GAMEOPTION_COLOR_BLIND_DEFAULT_OFF GUIO_GAMEOPTIONS1 -} // End of namespace CGE - static const PlainGameDescriptor CGEGames[] = { { "soltys", "Soltys" }, { 0, 0 } }; -namespace CGE { - static const ADGameDescription gameDescriptions[] = { { - "soltys", "", - { - {"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176}, - {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437572}, - AD_LISTEND - }, - Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0() - }, - { "soltys", "Freeware", { {"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176}, @@ -114,12 +98,6 @@ static const ADGameDescription gameDescriptions[] = { AD_TABLE_END_MARKER }; -static const ADFileBasedFallback fileBasedFallback[] = { - { &gameDescriptions[0], { "vol.cat", "vol.dat", 0 } }, - { 0, { 0 } } -}; -} // End of namespace CGE - static const ADExtraGuiOptionsMap optionsList[] = { { GAMEOPTION_COLOR_BLIND_DEFAULT_OFF, @@ -136,14 +114,10 @@ static const ADExtraGuiOptionsMap optionsList[] = { class CGEMetaEngine : public AdvancedMetaEngine { public: - CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(CGE::CgeGameDescription), CGEGames, optionsList) { + CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) { _singleid = "soltys"; } - virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { - return detectGameFilebased(allFiles, fslist, CGE::fileBasedFallback); - } - virtual const char *getName() const { return "CGE"; } @@ -152,6 +126,7 @@ public: return "Soltys (c) 1994-1996 L.K. Avalon"; } + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual int getMaximumSaveSlot() const; @@ -160,6 +135,44 @@ public: virtual void removeSaveState(const char *target, int slot) const; }; +static const ADFileBasedFallback fileBasedFallback[] = { + { &gameDescriptions[0], { "vol.cat", "vol.dat", 0 } }, + { 0, { 0 } } +}; + +static ADGameDescription s_fallbackDesc = { + "Soltys", + "Unknown version", + AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor + Common::UNK_LANG, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF) +}; + +const ADGameDescription *CGEMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + ADFilePropertiesMap filesProps; + + const ADGameDescription *game; + game = detectGameFilebased(allFiles, fslist, CGE::fileBasedFallback, &filesProps); + + if (!game) + return nullptr; + + SearchMan.clear(); + SearchMan.addDirectory(fslist.begin()->getParent().getPath(), fslist.begin()->getParent()); + ResourceManager *resman; + resman = new ResourceManager(); + bool result = resman->exist("CGE.SAY"); + delete resman; + + if (!result) + return nullptr; + + reportUnknown(fslist.begin()->getParent(), filesProps); + return &s_fallbackDesc; +} + bool CGEMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || @@ -269,9 +282,10 @@ bool CGEMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD } return desc != 0; } +} // End of namespace CGE #if PLUGIN_ENABLED_DYNAMIC(CGE) - REGISTER_PLUGIN_DYNAMIC(CGE, PLUGIN_TYPE_ENGINE, CGEMetaEngine); +REGISTER_PLUGIN_DYNAMIC(CGE, PLUGIN_TYPE_ENGINE, CGE::CGEMetaEngine); #else - REGISTER_PLUGIN_STATIC(CGE, PLUGIN_TYPE_ENGINE, CGEMetaEngine); +REGISTER_PLUGIN_STATIC(CGE, PLUGIN_TYPE_ENGINE, CGE::CGEMetaEngine); #endif diff --git a/engines/cge/fileio.cpp b/engines/cge/fileio.cpp index d910e275eb..8609110782 100644 --- a/engines/cge/fileio.cpp +++ b/engines/cge/fileio.cpp @@ -121,7 +121,10 @@ BtPage *ResourceManager::getPage(int level, uint16 pageId) { if (_buff[level]._pageNo != pageId) { int32 pos = pageId * kBtSize; _buff[level]._pageNo = pageId; - assert(_catFile->size() > pos); + + if (_catFile->size() <= pos) + return nullptr; + // In the original, there was a check verifying if the // purpose was to write a new file. This should only be // to create a new file, thus it was removed. @@ -146,6 +149,9 @@ BtKeypack *ResourceManager::find(const char *key) { uint16 nxt = kBtValRoot; while (!_catFile->eos()) { BtPage *pg = getPage(lev, nxt); + if (!pg) + return nullptr; + // search if (pg->_header._down != kBtValNone) { int i; @@ -167,13 +173,17 @@ BtKeypack *ResourceManager::find(const char *key) { return &pg->_leaf[i]; } } - return NULL; + return nullptr; } bool ResourceManager::exist(const char *name) { debugC(1, kCGEDebugFile, "ResourceManager::exist(%s)", name); - return scumm_stricmp(find(name)->_key, name) == 0; + BtKeypack* result = find(name); + if (!result) + return false; + + return scumm_stricmp(result->_key, name) == 0; } uint16 ResourceManager::catRead(byte *buf, uint16 length) { diff --git a/engines/cge2/POTFILES b/engines/cge2/POTFILES new file mode 100644 index 0000000000..1e904763ec --- /dev/null +++ b/engines/cge2/POTFILES @@ -0,0 +1 @@ +engines/cge2/detection.cpp diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp index 852b7afb22..37d87ba09c 100644 --- a/engines/cge2/cge2.cpp +++ b/engines/cge2/cge2.cpp @@ -76,6 +76,7 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _vol[i] = nullptr; _eventManager = nullptr; _map = nullptr; + _console = nullptr; _quitFlag = false; _bitmapPalette = nullptr; _gamePhase = kPhaseIntro; diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h index 1f1cb17b48..50b418f294 100644 --- a/engines/cge2/cge2.h +++ b/engines/cge2/cge2.h @@ -93,10 +93,7 @@ struct SavegameHeader; #define kPowerRef 123 #define kDvolRef 124 #define kMvolRef 125 -#define kRef 126 #define kBusyRef 127 -#define kCapRef 128 -#define kVoxRef 129 #define kOffUseCount 130 #define kOffUseText 131 diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index 1057b00089..3e3d615a91 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -722,10 +722,9 @@ void CGE2Engine::loadTab() { if (_resman->exist(kTabName)) { EncryptedStream f(this, kTabName); - uint32 v; for (int i = 0; i < kSceneMax; i++) { - v = f.readUint32LE(); + uint32 v = f.readUint32LE(); _eyeTab[i]->_x = FXP(v >> 8, static_cast<int>((int8)(v & 0xff))); v = f.readUint32LE(); diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp index 605a3fe377..c05ce70c3d 100644 --- a/engines/cge2/detection.cpp +++ b/engines/cge2/detection.cpp @@ -26,6 +26,7 @@ */ #include "cge2/cge2.h" +#include "cge2/fileio.h" #include "engines/advancedDetector.h" #include "common/translation.h" #include "graphics/surface.h" @@ -60,6 +61,16 @@ static const ADGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF) }, + { + "sfinx", "Freeware v0.3", + { + {"vol.cat", 0, "f158e469dccbebc5a632eb848df89779", 129024}, + {"vol.dat", 0, "d40a6b4ae173d6930be54ba56bee15d5", 34183430}, + AD_LISTEND + }, + Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF) + }, + AD_TABLE_END_MARKER }; @@ -91,16 +102,55 @@ public: return "Sfinx (c) 1994-1997 Janus B. Wisniewski and L.K. Avalon"; } + virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; +}; + +static const ADFileBasedFallback fileBasedFallback[] = { + { &gameDescriptions[0], { "vol.cat", "vol.dat", 0 } }, + { 0, { 0 } } +}; - const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; +static ADGameDescription s_fallbackDesc = { + "Sfinx", + "Unknown version", + AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor + Common::UNK_LANG, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF) }; +// This fallback detection looks identical to the one used for CGE. In fact, the difference resides +// in the ResourceManager which handles a different archive format. The rest of the detection is identical. +const ADGameDescription *CGE2MetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + ADFilePropertiesMap filesProps; + + const ADGameDescription *game; + game = detectGameFilebased(allFiles, fslist, CGE2::fileBasedFallback, &filesProps); + + if (!game) + return 0; + + SearchMan.clear(); + SearchMan.addDirectory(fslist.begin()->getParent().getPath(), fslist.begin()->getParent()); + ResourceManager *resman; + resman = new ResourceManager(); + bool result = resman->exist("CGE.SAY"); + delete resman; + + if (!result) + return 0; + + reportUnknown(fslist.begin()->getParent(), filesProps); + return &s_fallbackDesc; +} + bool CGE2MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new CGE2::CGE2Engine(syst, desc); @@ -118,31 +168,6 @@ bool CGE2MetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup); } -const ADGameDescription *CGE2MetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { - static ADGameDescription desc; - - for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { - if (file->isDirectory()) - continue; - - if (file->getName().equalsIgnoreCase("lang.eng")) { - Common::File dataFile; - if (!dataFile.open(*file)) - continue; - - desc.gameid = "sfinx"; - desc.extra = "Translation Alpha v0.3"; - desc.language = Common::EN_ANY; - desc.platform = Common::kPlatformDOS; - desc.flags = ADGF_NO_FLAGS; - desc.guioptions = GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF); - - return (const ADGameDescription *)&desc; - } - } - return 0; -} - int CGE2MetaEngine::getMaximumSaveSlot() const { return 99; } diff --git a/engines/cge2/fileio.cpp b/engines/cge2/fileio.cpp index 6f8009716b..acb5bb870f 100644 --- a/engines/cge2/fileio.cpp +++ b/engines/cge2/fileio.cpp @@ -116,7 +116,10 @@ BtPage *ResourceManager::getPage(int level, uint16 pageId) { if (_buff[level]._pageNo != pageId) { int32 pos = pageId * kBtSize; _buff[level]._pageNo = pageId; - assert(_catFile->size() > pos); + + if (_catFile->size() <= pos) + return nullptr; + // In the original, there was a check verifying if the // purpose was to write a new file. This should only be // to create a new file, thus it was removed. @@ -139,6 +142,9 @@ BtKeypack *ResourceManager::find(const char *key) { uint16 nxt = kBtValRoot; while (!_catFile->eos()) { BtPage *pg = getPage(lev, nxt); + if (!pg) + return nullptr; + // search if (pg->_header._down != kBtValNone) { int i; @@ -170,7 +176,11 @@ BtKeypack *ResourceManager::find(const char *key) { } bool ResourceManager::exist(const char *name) { - return scumm_stricmp(find(name)->_key, name) == 0; + BtKeypack *result = find(name); + if (!result) + return false; + + return scumm_stricmp(result->_key, name) == 0; } uint16 ResourceManager::catRead(byte *buf, uint16 length) { diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp index 86bd7ac953..225df54bd1 100644 --- a/engines/cge2/hero.cpp +++ b/engines/cge2/hero.cpp @@ -31,13 +31,14 @@ namespace CGE2 { -Hero::Hero(CGE2Engine *vm) - : Sprite(vm), _contact(nullptr), _dir(kNoDir), - _curDim(0), _tracePtr(-1), _ignoreMap(false), _maxDist(0) { +Hero::Hero(CGE2Engine *vm) : Sprite(vm), _contact(nullptr), _dir(kNoDir), + _curDim(0), _tracePtr(-1), _ignoreMap(false), _maxDist(0) { - for (int i = 0; i < kDimMax; i++) { + for (int i = 0; i < kDimMax; i++) _dim[i] = nullptr; - } + + _reachStart = _reachCycle = _sayStart = _funStart = 0; + _funDel0 = _funDel = 0; } Hero::~Hero() { @@ -120,7 +121,8 @@ Sprite *Hero::expand() { break; case kIdName: Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr)); - for (p = tmpStr; *p != '='; p++); // We search for the = + for (p = tmpStr; *p != '='; p++) // We search for the = + ; setName(_vm->tail(p)); break; default: @@ -201,7 +203,7 @@ Sprite *Hero::expand() { delete[] text; int i = stepSize() / 2; - _maxDist = sqrt(double(i * i * 2)); + _maxDist = (int)sqrt(double(i * i * 2)); setCurrent(); return this; @@ -413,7 +415,7 @@ void Hero::fun() { } int Hero::len(V2D v) { - return sqrt(double(v.x * v.x + v.y * v.y)); + return (int)sqrt(double(v.x * v.x + v.y * v.y)); } bool Hero::findWay(){ diff --git a/engines/cge2/map.cpp b/engines/cge2/map.cpp index 1ed0ea7daf..8c1f00048f 100644 --- a/engines/cge2/map.cpp +++ b/engines/cge2/map.cpp @@ -42,7 +42,7 @@ void Map::clear() { void Map::load(int scene) { clear(); - char fname[] = "%.2d.MAP\0"; + const char *fname = "%.2d.MAP"; Common::String fileName = Common::String::format(fname, scene); if (!_vm->_resman->exist(fileName.c_str())) return; diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp index 32f94b17b9..57ec5983e8 100644 --- a/engines/cge2/sound.cpp +++ b/engines/cge2/sound.cpp @@ -143,9 +143,9 @@ void Fx::clear() { } Common::String Fx::name(int ref, int sub) { - char fxname[] = "%.2dfx%.2d.WAV\0"; - char subName[] = "%.2dfx%.2d?.WAV\0"; - char *p = (sub) ? subName : fxname; + const char *fxname = "%.2dfx%.2d.WAV"; + const char *subName = "%.2dfx%.2d?.WAV"; + const char *p = (sub) ? subName : fxname; Common::String filename = Common::String::format(p, ref >> 8, ref & 0xFF); if (sub) filename.setChar('@' + sub, 6); diff --git a/engines/cge2/toolbar.cpp b/engines/cge2/toolbar.cpp index 6af64b1f5c..0cd220c984 100644 --- a/engines/cge2/toolbar.cpp +++ b/engines/cge2/toolbar.cpp @@ -35,11 +35,11 @@ namespace CGE2 { -#define kSoundNumtoStateRate 25.7 +#define kSoundNumToStateRate 25.7 // == 257 / 10; where 10 equals to the volume switches' number of states [0..9] // and ScummVM has a scale of 257 different values for setting sounds. -#define kSoundStatetoNumRate 28.45 +#define kSoundStateToNumRate 28.45 // == 256 / 9 + 0.1; where 256 is the positive range of numbers we can set the volume to // and the 10 states of a switch cut this range up to 9 equally big parts. // We don't take into account 0 regarding the 256 different values (it would be the 257th), @@ -120,7 +120,7 @@ void CGE2Engine::setVolume(int idx, int cnt) { int p = _vol[idx]->_seqPtr + cnt; if ((p >= 0) && (p < _vol[idx]->_seqCnt)) { _vol[idx]->step(p); - int newVolume = p * kSoundStatetoNumRate; + int newVolume = (int)(p * kSoundStateToNumRate); switch (idx) { case 0: _oldSfxVolume = ConfMan.getInt("sfx_volume"); @@ -140,11 +140,11 @@ void CGE2Engine::setVolume(int idx, int cnt) { void CGE2Engine::checkVolumeSwitches() { int musicVolume = ConfMan.getInt("music_volume"); if (musicVolume != _oldMusicVolume) - _vol[1]->step(musicVolume / kSoundNumtoStateRate); + _vol[1]->step((int)(musicVolume / kSoundNumToStateRate)); int sfxVolume = ConfMan.getInt("sfx_volume"); if (sfxVolume != _oldSfxVolume) - _vol[0]->step(sfxVolume / kSoundNumtoStateRate); + _vol[0]->step((int)(sfxVolume / kSoundNumToStateRate)); } void CGE2Engine::switchCap() { @@ -208,14 +208,13 @@ void CGE2Engine::initToolbar() { void CGE2Engine::initVolumeSwitch(Sprite *volSwitch, int val) { int state = 0; - state = val / kSoundNumtoStateRate; + state = (int)(val / kSoundNumToStateRate); volSwitch->step(state); } void CGE2Engine::checkMute() { bool mute = ConfMan.getBool("mute"); - bool mutedChanged = mute != _muteAll; - if (mutedChanged) { + if (mute != _muteAll) { switchMusic(); switchVox(); _muteAll = mute; diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp index db96682237..227633579e 100644 --- a/engines/cge2/vga13h.cpp +++ b/engines/cge2/vga13h.cpp @@ -371,7 +371,8 @@ Sprite *Sprite::expand() { break; case kIdName: Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr)); - for (p = tmpStr; *p != '='; p++); // We search for the = + for (p = tmpStr; *p != '='; p++) // We search for the = + ; setName(_vm->tail(p)); break; default: diff --git a/engines/dreamweb/POTFILES b/engines/dreamweb/POTFILES index d05d239bb7..64fb20db67 100644 --- a/engines/dreamweb/POTFILES +++ b/engines/dreamweb/POTFILES @@ -1 +1,3 @@ engines/dreamweb/detection.cpp +engines/dreamweb/saveload.cpp + diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp index 1431ceffba..8ec05caaff 100644 --- a/engines/fullpipe/scenes/scene27.cpp +++ b/engines/fullpipe/scenes/scene27.cpp @@ -340,7 +340,7 @@ void sceneHandler27_wipeDo() { bool sceneHandler27_batFallLogic(uint batn) { Bat *bat = g_vars->scene27_bats[batn]; - int y = (bat->currY - 458.0) * 0.4848484848484849 + 734.0; + int y = (int)((bat->currY - 458.0) * 0.4848484848484849 + 734.0); if (y >= bat->currX) return false; diff --git a/engines/gob/POTFILES b/engines/gob/POTFILES index 9a512469dd..ca7aa14177 100644 --- a/engines/gob/POTFILES +++ b/engines/gob/POTFILES @@ -1,3 +1,5 @@ engines/gob/inter_playtoons.cpp engines/gob/inter_v2.cpp engines/gob/inter_v5.cpp +engines/gob/inter_geisha.cpp + diff --git a/engines/hopkins/POTFILES b/engines/hopkins/POTFILES new file mode 100644 index 0000000000..1ea7d5111b --- /dev/null +++ b/engines/hopkins/POTFILES @@ -0,0 +1,2 @@ +engines/hopkins/detection.cpp + diff --git a/engines/kyra/POTFILES b/engines/kyra/POTFILES index 16888e2c5a..e5b380e52e 100644 --- a/engines/kyra/POTFILES +++ b/engines/kyra/POTFILES @@ -1,3 +1,4 @@ engines/kyra/detection.cpp engines/kyra/lol.cpp engines/kyra/sound_midi.cpp +engines/kyra/saveload_eob.cpp diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp index 512a3979f9..9b2c097004 100644 --- a/engines/mads/animation.cpp +++ b/engines/mads/animation.cpp @@ -32,10 +32,8 @@ void AAHeader::load(Common::SeekableReadStream *f) { _miscEntriesCount = f->readUint16LE(); _frameEntriesCount = f->readUint16LE(); _messagesCount = f->readUint16LE(); - f->skip(1); - _flags = f->readByte(); - - f->skip(2); + _loadFlags = f->readUint16LE(); + _charSpacing = f->readSint16LE(); _bgType = (AnimBgType)f->readUint16LE(); _roomNumber = f->readUint16LE(); f->skip(2); @@ -49,7 +47,7 @@ void AAHeader::load(Common::SeekableReadStream *f) { char buffer[FILENAME_SIZE]; f->read(buffer, FILENAME_SIZE); buffer[FILENAME_SIZE - 1] = '\0'; - _interfaceFile = Common::String(buffer); + _backgroundFile = Common::String(buffer); for (int i = 0; i < 50; ++i) { f->read(buffer, FILENAME_SIZE); @@ -134,7 +132,8 @@ void AnimMiscEntry::load(Common::SeekableReadStream *f) { _numTicks = f->readUint16LE(); _posAdjust.x = f->readSint16LE(); _posAdjust.y = f->readSint16LE(); - _field8 = f->readUint16LE(); + _scroll.x = f->readSByte(); + _scroll.y = f->readSByte(); } /*------------------------------------------------------------------------*/ @@ -189,7 +188,7 @@ Animation::~Animation() { } } -void Animation::load(UserInterface &interfaceSurface, DepthSurface &depthSurface, +void Animation::load(MSurface &backSurface, DepthSurface &depthSurface, const Common::String &resName, int flags, Common::Array<PaletteCycle> *palCycles, SceneInfo *sceneInfo) { Common::String resourceName = resName; @@ -207,7 +206,7 @@ void Animation::load(UserInterface &interfaceSurface, DepthSurface &depthSurface flags |= PALFLAG_RESERVED; if (flags & ANIMFLAG_LOAD_BACKGROUND) { - loadInterface(interfaceSurface, depthSurface, _header, flags, palCycles, sceneInfo); + loadBackground(backSurface, depthSurface, _header, flags, palCycles, sceneInfo); } if (flags & ANIMFLAG_LOAD_BACKGROUND_ONLY) { // No data @@ -275,7 +274,7 @@ void Animation::load(UserInterface &interfaceSurface, DepthSurface &depthSurface // If the animation specifies a font, then load it for access delete _font; - if (_header._flags & ANIMFLAG_CUSTOM_FONT) { + if (_header._loadFlags & ANIMFLAG_CUSTOM_FONT) { Common::String fontName = "*" + _header._fontResource; _font = _vm->_font->getFont(fontName.c_str()); } else { @@ -385,12 +384,12 @@ bool Animation::drawFrame(SpriteAsset &spriteSet, const Common::Point &pt, int f return 0; } -void Animation::loadInterface(UserInterface &interfaceSurface, DepthSurface &depthSurface, +void Animation::loadBackground(MSurface &backSurface, DepthSurface &depthSurface, AAHeader &header, int flags, Common::Array<PaletteCycle> *palCycles, SceneInfo *sceneInfo) { _scene->_depthStyle = 0; if (header._bgType <= ANIMBG_FULL_SIZE) { _vm->_palette->_paletteUsage.setEmpty(); - sceneInfo->load(header._roomNumber, flags, header._interfaceFile, 0, depthSurface, interfaceSurface); + sceneInfo->load(header._roomNumber, 0, header._backgroundFile, flags, depthSurface, backSurface); _scene->_depthStyle = sceneInfo->_depthStyle == 2 ? 1 : 0; if (palCycles) { palCycles->clear(); @@ -399,8 +398,8 @@ void Animation::loadInterface(UserInterface &interfaceSurface, DepthSurface &dep } } else if (header._bgType == ANIMBG_INTERFACE) { // Load a scene interface - Common::String resourceName = "*" + header._interfaceFile; - interfaceSurface.load(resourceName); + Common::String resourceName = "*" + header._backgroundFile; + backSurface.load(resourceName); if (palCycles) palCycles->clear(); diff --git a/engines/mads/animation.h b/engines/mads/animation.h index 15086d3e41..917d899ec5 100644 --- a/engines/mads/animation.h +++ b/engines/mads/animation.h @@ -34,8 +34,8 @@ namespace MADS { enum AnimFlag { - ANIMFLAG_DITHER = 0x0001, // Dither to 16 colors - ANIMFLAG_CUSTOM_FONT = 0x0020, // Load ccustom font + ANIMFLAG_DITHER = 0x1000, // Dither to 16 colors + ANIMFLAG_CUSTOM_FONT = 0x2000, // Load ccustom font ANIMFLAG_LOAD_BACKGROUND = 0x0100, // Load background ANIMFLAG_LOAD_BACKGROUND_ONLY = 0x0200 // Load background only }; @@ -82,7 +82,7 @@ public: int _msgIndex; int _numTicks; Common::Point _posAdjust; - int _field8; + Common::Point _scroll; /** * Loads data for the record @@ -116,14 +116,15 @@ public: int _miscEntriesCount; int _frameEntriesCount; int _messagesCount; - byte _flags; + int _loadFlags; + int _charSpacing; AnimBgType _bgType; int _roomNumber; bool _manualFlag; int _spritesIndex; Common::Point _scrollPosition; uint32 _scrollTicks; - Common::String _interfaceFile; + Common::String _backgroundFile; Common::StringArray _spriteSetNames; Common::String _lbmFilename; Common::String _spritesFilename; @@ -166,9 +167,9 @@ private: bool drawFrame(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber); /** - * Load the user interface display for an animation + * Load the user interface display or background for an animation */ - void loadInterface(UserInterface &interfaceSurface, DepthSurface &depthSurface, + void loadBackground(MSurface &backSurface, DepthSurface &depthSurface, AAHeader &header, int flags, Common::Array<PaletteCycle> *palCycles, SceneInfo *sceneInfo); /** @@ -196,7 +197,7 @@ public: /** * Loads animation data */ - void load(UserInterface &interfaceSurface, DepthSurface &depthSurface, const Common::String &resName, + void load(MSurface &backSurface, DepthSurface &depthSurface, const Common::String &resName, int flags, Common::Array<PaletteCycle> *palCycles, SceneInfo *sceneInfo); /** @@ -223,6 +224,8 @@ public: int roomNumber() const { return _header._roomNumber; } void resetSpriteSetsCount() { _header._spriteSetsCount = 0; } // CHECKME: See if it doesn't leak the memory when the destructor is called + + SpriteAsset *getSpriteSet(int idx) { return _spriteSets[idx]; } }; } // End of namespace MADS diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h index 3a5bf22eed..ebfb1f437a 100644 --- a/engines/mads/msurface.h +++ b/engines/mads/msurface.h @@ -64,6 +64,11 @@ public: * Helper method for calculating new dimensions when scaling a sprite */ static int scaleValue(int value, int scale, int err); + + /** + * Base method for descendents to load their contents + */ + virtual void load(const Common::String &resName) {} public: /** * Basic constructor diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp index 4d3beb3382..4f9493ade5 100644 --- a/engines/mads/nebular/menu_nebular.cpp +++ b/engines/mads/nebular/menu_nebular.cpp @@ -434,7 +434,7 @@ char TextView::_resourceName[100]; void TextView::execute(MADSEngine *vm, const Common::String &resName) { assert(resName.size() < 100); - strncpy(_resourceName, resName.c_str(), sizeof(_resourceName)); + Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName)); vm->_dialogs->_pendingDialog = DIALOG_TEXTVIEW; } @@ -451,6 +451,7 @@ TextView::TextView(MADSEngine *vm) : MenuView(vm) { _font = _vm->_font->getFont(FONT_CONVERSATION); _vm->_palette->resetGamePalette(4, 0); + load(); } @@ -495,7 +496,7 @@ void TextView::processLines() { processCommand(); // Copy rest of line (if any) to start of buffer - strncpy(_currentLine, cEnd + 1, sizeof(_currentLine)); + Common::strlcpy(_currentLine, cEnd + 1, sizeof(_currentLine)); cStart = strchr(_currentLine, '['); } @@ -656,7 +657,6 @@ void TextView::processText() { void TextView::display() { FullScreenDialog::display(); - _sceneChanged = true; } void TextView::resetPalette() { @@ -788,7 +788,7 @@ char AnimationView::_resourceName[100]; void AnimationView::execute(MADSEngine *vm, const Common::String &resName) { assert(resName.size() < 100); - strncpy(_resourceName, resName.c_str(), sizeof(_resourceName)); + Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName)); vm->_dialogs->_pendingDialog = DIALOG_ANIMVIEW; } @@ -796,13 +796,31 @@ AnimationView::AnimationView(MADSEngine *vm) : MenuView(vm) { _soundDriverLoaded = false; _previousUpdate = 0; _screenId = -1; - _showWhiteBars = true; _resetPalette = false; _resyncMode = NEVER; + _v1 = 0; + _v2 = -1; + _resourceIndex = -1; + _currentAnimation = nullptr; + _sfx = 0; + _soundFlag = _bgLoadFlag = true; + _showWhiteBars = true; + _manualFrameNumber = 0; + _manualSpriteSet = nullptr; + _manualStartFrame = _manualEndFrame = 0; + _manualFrame2 = 0; + _hasManual = false; + _animFrameNumber = 0; + _sceneInfo = SceneInfo::init(_vm); load(); } +AnimationView::~AnimationView() { + delete _currentAnimation; + delete _sceneInfo; +} + void AnimationView::load() { Common::String resName(_resourceName); if (!resName.hasSuffix(".")) @@ -814,6 +832,17 @@ void AnimationView::load() { processLines(); } +void AnimationView::display() { + _vm->_palette->initPalette(); + Common::fill(&_vm->_palette->_cyclingPalette[0], &_vm->_palette->_cyclingPalette[PALETTE_SIZE], 0); + + _vm->_palette->resetGamePalette(1, 8); + _vm->_game->_scene._spriteSlots.reset(); + _vm->_game->_scene._paletteCycles.clear(); + + MenuView::display(); +} + bool AnimationView::onEvent(Common::Event &event) { // Wait for the Escape key or a mouse press if (((event.type == Common::EVENT_KEYDOWN) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) || @@ -826,39 +855,69 @@ bool AnimationView::onEvent(Common::Event &event) { } void AnimationView::doFrame() { +// Scene &scene = _vm->_game->_scene; + + // TODO: Or when current animation is finished + if (_resourceIndex == -1) { + if (++_resourceIndex == (int)_resources.size()) + scriptDone(); + else + loadNextResource(); + } +} + +void AnimationView::loadNextResource() { Scene &scene = _vm->_game->_scene; - int bgNumber = 0; + ResourceEntry &resEntry = _resources[_resourceIndex]; - // Only update state if wait period has expired - if (_previousUpdate > 0) { - if (g_system->getMillis() - _previousUpdate < 3000) { - return; - } else { - // time for an update - _previousUpdate = g_system->getMillis(); - } - } else { - _previousUpdate = g_system->getMillis(); - return; + if (resEntry._bgFlag) + _vm->_palette->resetGamePalette(1, 8); + + delete _currentAnimation; + _currentAnimation = Animation::init(_vm, &scene); + _currentAnimation->load(scene._backgroundSurface, scene._depthSurface, + resEntry._resourceName, resEntry._bgFlag ? 0x100 : 0, + nullptr, _sceneInfo); + + // If a sound driver has been specified, then load the correct one + if (!_currentAnimation->_header._soundName.empty()) { + const char *chP = strchr(_currentAnimation->_header._soundName.c_str(), '.'); + assert(chP); + + int driverNum = atoi(chP + 1); + _vm->_sound->init(driverNum); } - /* - char bgFile[10]; - strncpy(bgFile, _currentFile, 5); - bgFile[0] = bgFile[2]; - bgFile[1] = bgFile[3]; - bgFile[2] = bgFile[4]; - bgFile[3] = '\0'; - bgNumber = atoi(bgFile); - sprintf(bgFile, "rm%i.art", bgNumber); - - // Not all scenes have a background. If there is one, refresh it - if (Common::File::exists(bgFile)) { - _vm->_palette->resetGamePalette(4, 8); - SceneInfo *sceneInfo = SceneInfo::init(_vm); - sceneInfo->load(bgNumber, 0, Common::String(), 0, scene._depthSurface, - scene._backgroundSurface); + + // Handle any manual setup + if (_currentAnimation->_header._manualFlag) { + _manualFrameNumber = _currentAnimation->_header._spritesIndex; + _manualSpriteSet = _currentAnimation->getSpriteSet(_manualFrameNumber); + _hasManual = true; } - */ + + // Set the sound data for the animation + _vm->_sound->setEnabled(resEntry._soundFlag); + + Common::String dsrName = _currentAnimation->_header._dsrName; + if (!dsrName.empty()) + _vm->_audio->setSoundGroup(dsrName); + + // Initial frames scan loop + bool foundFrame = false; + for (int frameCtr = 0; frameCtr < (int)_currentAnimation->_frameEntries.size(); ++frameCtr) { + int spritesIdx = _currentAnimation->_spriteListIndexes[_manualFrameNumber]; + AnimFrameEntry &frame = _currentAnimation->_frameEntries[frameCtr]; + + if (frame._spriteSlot._spritesIndex == spritesIdx) { + _animFrameNumber = frame._frameNumber; + _manualStartFrame = _animFrameNumber; + _manualEndFrame = _manualSpriteSet->getCount() - 1; + _manualFrame2 = _manualStartFrame - 1; + break; + } + } + if (!foundFrame) + _hasManual = false; } void AnimationView::scriptDone() { @@ -896,8 +955,8 @@ void AnimationView::processLines() { resName += c; } - _resources.push_back(ResourceEntry(resName, _sfx)); - _sfx = 0; + _resources.push_back(ResourceEntry(resName, _sfx, _soundFlag, + _bgLoadFlag, _showWhiteBars)); } // Skip any spaces @@ -914,6 +973,9 @@ void AnimationView::processCommand() { // Handle the command switch (commandChar) { + case 'B': + _soundFlag = !_soundFlag; + break; case 'H': // -h[:ex] Disable EMS / XMS high memory support if (_currentLine.hasPrefix(":")) @@ -980,6 +1042,42 @@ int AnimationView::getParameter() { return result; } +void AnimationView::checkResource(const Common::String &resourceName) { + //bool hasSuffix = false; + +} + +int AnimationView::scanResourceIndex(const Common::String &resourceName) { + int foundIndex = -1; + + if (_v1) { + const char *chP = strchr(resourceName.c_str(), '\\'); + if (!chP) { + chP = strchr(resourceName.c_str(), '*'); + } + + Common::String resName = chP ? Common::String(chP + 1) : resourceName; + + if (_v2 != 3) { + assert(_resIndex.size() == 0); + } + + // Scan for the resource name + for (uint resIndex = 0; resIndex < _resIndex.size(); ++resIndex) { + ResIndexEntry &resEntry = _resIndex[resIndex]; + if (resEntry._resourceName.compareToIgnoreCase(resourceName)) { + foundIndex = resIndex; + break; + } + } + } + + if (foundIndex >= 0) { + // TODO + } + return -1; +} + } // End of namespace Nebular diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h index 7abe3c8892..f8e84fa5b6 100644 --- a/engines/mads/nebular/menu_nebular.h +++ b/engines/mads/nebular/menu_nebular.h @@ -162,7 +162,6 @@ private: static char _resourceName[100]; bool _animating; - bool _sceneChanged; Common::Array<TextLine> _textLines; Common::Point _pan; int _panSpeed; @@ -230,15 +229,30 @@ enum ResyncMode { NEVER, ALWAYS, BEGINNING }; struct ResourceEntry { Common::String _resourceName; - int _sfx; + int _fx; + bool _soundFlag; + bool _bgFlag; + bool _showWhiteBars; ResourceEntry() {} - ResourceEntry(const Common::String &resName, int sfx) { + ResourceEntry(const Common::String &resName, int fx, bool soundFlag, + bool bgFlag, bool showWhiteBars) { _resourceName = resName; - _sfx = sfx; + _fx = fx; + _soundFlag = soundFlag; + _bgFlag = bgFlag; + _showWhiteBars = showWhiteBars; } }; +struct ResIndexEntry { + int _id; + int _v; + Common::String _resourceName; + + ResIndexEntry() {} +}; + /** * Animation cutscene view */ @@ -250,12 +264,30 @@ private: uint32 _previousUpdate; Common::String _currentLine; bool _soundDriverLoaded; - bool _showWhiteBars; bool _resetPalette; ResyncMode _resyncMode; int _sfx; + bool _soundFlag; + bool _bgLoadFlag; + bool _showWhiteBars; Common::Array<ResourceEntry> _resources; + Common::Array<ResIndexEntry> _resIndex; + int _v1; + int _v2; + int _resourceIndex; + SceneInfo *_sceneInfo; + Animation *_currentAnimation; + int _manualFrameNumber; + SpriteAsset *_manualSpriteSet; + int _manualStartFrame, _manualEndFrame; + int _manualFrame2; + bool _hasManual; + int _animFrameNumber; private: + void checkResource(const Common::String &resourceName); + + int scanResourceIndex(const Common::String &resourceName); + void load(); void processLines(); @@ -265,7 +297,11 @@ private: int getParameter(); void scriptDone(); + + void loadNextResource(); protected: + virtual void display(); + virtual void doFrame(); virtual bool onEvent(Common::Event &event); @@ -277,7 +313,7 @@ public: AnimationView(MADSEngine *vm); - virtual ~AnimationView() {} + virtual ~AnimationView(); }; } // End of namespace Nebular diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp index 5ce362e053..c540eb4382 100644 --- a/engines/mads/nebular/sound_nebular.cpp +++ b/engines/mads/nebular/sound_nebular.cpp @@ -3141,7 +3141,7 @@ ASound9::ASound9(Audio::Mixer *mixer, FM_OPL *opl) : ASound(mixer, opl, "asound. } int ASound9::command(int commandId, int param) { - if (commandId > 60) + if (commandId > 51) return 0; _commandParam = param; diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp index ba2179fcbf..0b2531ef65 100644 --- a/engines/mads/phantom/game_phantom.cpp +++ b/engines/mads/phantom/game_phantom.cpp @@ -50,11 +50,12 @@ void GamePhantom::startGame() { } void GamePhantom::initializeGlobals() { - //int count, count2; - //int bad; - _globals.reset(); - //_globals[kTalkInanimateCount] = 8; + + warning("TODO: sub_316DA()"); + + _player._facing = FACING_NORTH; + _player._turnToFacing = FACING_NORTH; /* Section #1 variables */ // TODO @@ -74,11 +75,7 @@ void GamePhantom::initializeGlobals() { /* Section #9 variables */ // TODO - _player._facing = FACING_NORTH; - _player._turnToFacing = FACING_NORTH; - - //Player::preloadSequences("RXM", 1); - //Player::preloadSequences("ROX", 1); + Player::preloadSequences("RAL", 1); } void GamePhantom::setSectionHandler() { diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h index f251441e40..89044c9bf1 100644 --- a/engines/mads/user_interface.h +++ b/engines/mads/user_interface.h @@ -225,7 +225,7 @@ public: /** * Loads an interface from a specified resource */ - void load(const Common::String &resName); + virtual void load(const Common::String &resName); /** * Set up the interface diff --git a/engines/queen/POTFILES b/engines/queen/POTFILES index 1baf9c24de..28624662ca 100644 --- a/engines/queen/POTFILES +++ b/engines/queen/POTFILES @@ -1 +1 @@ -engines/queen/queen.cpp +engines/queen/detection.cpp diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp index edb12a3dd9..1e1c397212 100644 --- a/engines/saga/shorten.cpp +++ b/engines/saga/shorten.cpp @@ -438,7 +438,7 @@ byte *loadShortenFromStream(Common::ReadStream &stream, int &size, int &rate, by for (i = 0; i < 64; ++i) oldValues[curChannel][i] = 0; - int arrayTerminator = MIN<int>(64, blockSize); + uint arrayTerminator = MIN<int>(64, blockSize); for (i = 0; i < arrayTerminator; ++i) oldValues[curChannel][i] = buffer[curChannel][blockSize - (i + 1)]; diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp index 4c7cd9b84a..66778f0914 100644 --- a/engines/sci/resource_audio.cpp +++ b/engines/sci/resource_audio.cpp @@ -710,7 +710,6 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers // 0x20 is set on rhythm channels to prevent remapping // CHECKME: Which SCI versions need that set manually? - channel->flags = (*channel->data) >> 4; if (channel->number == 9) channel->flags |= 2; // Note: flag 1: channel start offset is 0 instead of 10 diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES index 6034320259..6d10537d3c 100644 --- a/engines/scumm/POTFILES +++ b/engines/scumm/POTFILES @@ -1,3 +1,6 @@ engines/scumm/dialogs.cpp engines/scumm/help.cpp engines/scumm/scumm.cpp +engines/scumm/players/player_v3m.cpp +engines/scumm/players/player_v5m.cpp + diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 7cd50e1f4c..a7922b232e 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -504,12 +504,6 @@ static void computeGameSettingsFromMD5(const Common::FSList &fslist, const GameF dr.extra = "V1 Demo"; } - // HACK: If 'Demo' occurs in the extra string, set the GF_DEMO flag, - // required by some game demos (e.g. Dig, FT and COMI). - if (dr.extra && strstr(dr.extra, "Demo")) { - dr.game.features |= GF_DEMO; - } - // HACK: Try to detect languages for translated games if (dr.language == UNK_LANG) { dr.language = detectLanguage(fslist, dr.game.id); diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index ae334c201c..791963e237 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -260,13 +260,16 @@ static const GameSettings gameVariantsTable[] = { {"samnmax", "Floppy", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO1(GUIO_NOSPEECH)}, #ifdef ENABLE_SCUMM_7_8 - {"ft", 0, 0, GID_FT, 7, 0, MDT_NONE, 0, UNK, GUIO1(GUIO_NOMIDI)}, + {"ft", "", 0, GID_FT, 7, 0, MDT_NONE, 0, UNK, GUIO1(GUIO_NOMIDI)}, + {"ft", "Demo", 0, GID_FT, 7, 0, MDT_NONE, GF_DEMO, UNK, GUIO1(GUIO_NOMIDI)}, - {"dig", "", 0, GID_DIG, 7, 0, MDT_NONE, 0, UNK, GUIO1(GUIO_NOMIDI)}, + {"dig", "", 0, GID_DIG, 7, 0, MDT_NONE, 0, UNK, GUIO1(GUIO_NOMIDI)}, + {"dig", "Demo", 0, GID_DIG, 7, 0, MDT_NONE, GF_DEMO, UNK, GUIO1(GUIO_NOMIDI)}, {"dig", "Steam", "steam", GID_DIG, 7, 0, MDT_NONE, 0, UNK, GUIO1(GUIO_NOMIDI)}, - {"comi", 0, 0, GID_CMI, 8, 0, MDT_NONE, 0, Common::kPlatformWindows, GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)}, -#endif + {"comi", "", 0, GID_CMI, 8, 0, MDT_NONE, 0, Common::kPlatformWindows, GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)}, + {"comi", "Demo", 0, GID_CMI, 8, 0, MDT_NONE, GF_DEMO, Common::kPlatformWindows, GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)}, + #endif // Humongous Entertainment Scumm Version 6 {"activity", "", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO1(GUIO_NOLAUNCHLOAD)}, diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 7919075d0b..db836467ef 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -1013,7 +1013,6 @@ void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte * od->actordir = (byte)READ_LE_UINT16(&imhd->v7.actordir); } else if (_game.version == 6) { - assert(imhd); od->obj_nr = READ_LE_UINT16(&(cdhd->v6.obj_id)); od->width = READ_LE_UINT16(&cdhd->v6.w); diff --git a/engines/scumm/players/player_mac.cpp b/engines/scumm/players/player_mac.cpp index fe15698494..634fd2de2b 100644 --- a/engines/scumm/players/player_mac.cpp +++ b/engines/scumm/players/player_mac.cpp @@ -21,7 +21,6 @@ */ #include "common/macresman.h" -#include "common/translation.h" #include "engines/engine.h" #include "gui/message.h" #include "scumm/players/player_mac.h" diff --git a/engines/sword1/POTFILES b/engines/sword1/POTFILES index 849bef9060..b60d55ff22 100644 --- a/engines/sword1/POTFILES +++ b/engines/sword1/POTFILES @@ -1,4 +1,4 @@ engines/sword1/animation.cpp engines/sword1/control.cpp engines/sword1/logic.cpp -engines/sword1/sword1.cpp + diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index ef4a2ee025..9140bddb65 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -126,51 +126,44 @@ void Sound::checkSpeechFileEndianness() { if (sampleSize) { uint32 size; // Compute average of difference between two consecutive samples for both BE and LE - // The way uncompressSpeech works we may get un incorrect number of identical consecutive samples - // when using the wrong endianess. To avoid biasing the result we this we skip all duplicate values. _bigEndianSpeech = false; int16 *data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size); - if (data) { - uint32 max_cpt = size > 2000 ? 2000 : size; - double le_diff_sum = 0.; - uint32 le_cpt = 0; - for (uint32 i = 1; i < size && le_cpt < max_cpt; ++i) { - if (data[i] != data[i-1]) { - le_diff_sum += fabs((double)(data[i] - data[i - 1])); - ++le_cpt; - } - } - le_diff_sum /= le_cpt; - delete[] data; - _bigEndianSpeech = true; - data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size); - if (data) { - double be_diff_sum = 0.; - uint32 be_cpt = 0; - for (uint32 i = 1; i < size && be_cpt < le_cpt; ++i) { - if (data[i] != data[i-1]) { - be_diff_sum += fabs((double)(data[i] - data[i - 1])); - ++be_cpt; - } - } - be_diff_sum /= be_cpt; - delete [] data; - // Set the big endian flag - // uncompreesSpeech gives data in little endian, so on big endian systems the heuristic is actually reversed -#ifdef SCUMM_BIG_ENDIAN - _bigEndianSpeech = (le_diff_sum < be_diff_sum); -#else - _bigEndianSpeech = (be_diff_sum < le_diff_sum); -#endif - if (_bigEndianSpeech) - debug(6, "Mac version: using big endian speech file"); - else - debug(6, "Mac version: using little endian speech file"); - debug(8, "Speech endianness heuristic: average = %f for BE (%d samples) and %f for LE (%d samples)", be_diff_sum, be_cpt, le_diff_sum, le_cpt); - } else - _bigEndianSpeech = false; + uint32 maxSamples = size > 2000 ? 2000 : size; + double le_diff = endiannessHeuristicValue(data, size, maxSamples); + delete[] data; + _bigEndianSpeech = true; + data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size); + double be_diff = endiannessHeuristicValue(data, size, maxSamples); + delete [] data; + // Set the big endian flag + _bigEndianSpeech = (be_diff < le_diff); + if (_bigEndianSpeech) + debug(6, "Mac version: using big endian speech file"); + else + debug(6, "Mac version: using little endian speech file"); + debug(8, "Speech endianness heuristic: average = %f for BE and %f for LE (%d samples)", be_diff, le_diff, maxSamples); + } +} + +double Sound::endiannessHeuristicValue(int16* data, uint32 dataSize, uint32 &maxSamples) { + if (!data) + return 50000.; // the heuristic value for the wrong endianess is about 21000 (1/3rd of the 16 bits range) + + double diff_sum = 0.; + uint32 cpt = 0; + int16 prev_value = (int16)FROM_LE_16(*((uint16 *)(data))); + for (uint32 i = 1; i < dataSize && cpt < maxSamples; ++i) { + int16 value = (int16)FROM_LE_16(*((uint16 *)(data + i))); + if (value != prev_value) { + diff_sum += fabs((double)(value - prev_value)); + ++cpt; + prev_value = value; } } + if (cpt == 0) + return 50000.; + maxSamples = cpt; + return diff_sum / cpt; } diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index 54006bd8b4..e65e797934 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -102,6 +102,7 @@ public: void engine(); void checkSpeechFileEndianness(); + double endiannessHeuristicValue(int16* data, uint32 dataSize, uint32 &maxSamples); private: uint8 _sfxVolL, _sfxVolR, _speechVolL, _speechVolR; diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 08ea02f32d..1e9b7f70f4 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -774,6 +774,8 @@ void SwordEngine::reinitRes() { _logic->newScreen(Logic::_scriptVars[NEW_SCREEN]); _sound->newScreen(Logic::_scriptVars[NEW_SCREEN]); Logic::_scriptVars[SCREEN] = Logic::_scriptVars[NEW_SCREEN]; + _logic->engine(); + _logic->updateScreenParams(); _screen->fullRefresh(); _screen->draw(); } diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp index fb83b7f941..7d68081593 100644 --- a/engines/sword25/kernel/persistenceservice.cpp +++ b/engines/sword25/kernel/persistenceservice.cpp @@ -52,7 +52,7 @@ static const uint SLOT_COUNT = 18; static const uint FILE_COPY_BUFFER_SIZE = 1024 * 10; static const char *VERSIONIDOLD = "SCUMMVM1"; static const char *VERSIONID = "SCUMMVM2"; -static const int VERSIONNUM = 2; +static const int VERSIONNUM = 3; #define MAX_SAVEGAME_SIZE 100 diff --git a/engines/sword25/util/pluto/pluto.cpp b/engines/sword25/util/pluto/pluto.cpp index fb477c1687..78b0a815e8 100644 --- a/engines/sword25/util/pluto/pluto.cpp +++ b/engines/sword25/util/pluto/pluto.cpp @@ -835,7 +835,15 @@ static void persistthread(PersistInfo *pi) #endif write_size(pi, &stackbase); write_size(pi, &stacktop); + + // ptrdiff_t changes sizes based on 32/64 bit + // Hard cast to 64 bit size if SIZE64 is defined +#ifdef SIZES64 + uint64 ptrIndex = static_cast<uint64>(L2->errfunc); + pi_write(pi, &ptrIndex, sizeof(uint64), pi->ud); +#else pi_write(pi, &L2->errfunc, sizeof(ptrdiff_t), pi->ud); +#endif //write_size(pi, (size_t *)&L2->errfunc); } @@ -944,12 +952,6 @@ static void persist(PersistInfo *pi) if(!lua_isnil(pi->L, -1)) { /* perms reftbl ... obj ref */ int zero = 0; - // FIXME: Casting a pointer to an integer data type is a bad idea we - // should really get rid of this by fixing the design of this code. - // For now casting to size_t should silence most (all?) compilers, - // since size_t is supposedly the same size as a pointer on most - // (modern) architectures. - int ref = (int)(size_t)lua_touserdata(pi->L, -1); pi_write(pi, &zero, sizeof(int), pi->ud); if (humanReadable) { snprintf(hrBuf, hrBufSize, "persist_seenobject\n"); @@ -958,7 +960,8 @@ static void persist(PersistInfo *pi) #ifdef TOTEXT printf("persist_seenobject\n"); #endif - pi_write(pi, &ref, sizeof(int), pi->ud); + int *ref = (int *)lua_touserdata(pi->L, -1); + pi_write(pi, ref, sizeof(int), pi->ud); if (humanReadable) { snprintf(hrBuf, hrBufSize, "persist_touserdata_ref %d\n", ref); hrOut(pi); @@ -1011,7 +1014,8 @@ static void persist(PersistInfo *pi) } lua_pushvalue(pi->L, -1); /* perms reftbl ... obj obj */ - lua_pushlightuserdata(pi->L, (void *)(++(pi->counter))); + int *ref = (int *)lua_newuserdata(pi->L, sizeof(int)); + *ref = ++(pi->counter); /* perms reftbl ... obj obj ref */ lua_rawset(pi->L, 2); /* perms reftbl ... obj */ @@ -1737,7 +1741,16 @@ static void unpersistthread(int ref, UnpersistInfo *upi) verify(LIF(Z,read)(&upi->zio, &L2->status, sizeof(lu_byte)) == 0); read_size(&upi->zio, &stackbase); read_size(&upi->zio, &stacktop); + +#ifdef SIZES64 + uint64 value; + verify(LIF(Z,read)(&upi->zio, &value, sizeof(uint64)) == 0); + + L2->errfunc = static_cast<ptrdiff_t>(value); +#else verify(LIF(Z,read)(&upi->zio, &L2->errfunc, sizeof(ptrdiff_t)) == 0); +#endif + //read_size(&upi->zio, (size_t *)&L2->errfunc); L2->base = L2->stack + stackbase; L2->top = L2->stack + stacktop; diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 97a14e5bc1..1d0e136d69 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -24,7 +24,6 @@ #include "engines/advancedDetector.h" #include "common/savefile.h" #include "common/system.h" -#include "common/translation.h" #include "base/plugins.h" diff --git a/engines/tsage/POTFILES b/engines/tsage/POTFILES new file mode 100644 index 0000000000..de18cbd072 --- /dev/null +++ b/engines/tsage/POTFILES @@ -0,0 +1,3 @@ +engines/tsage/dialogs.cpp +engines/tsage/scenes.cpp + diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp index 2f337ac549..5be27c9ae7 100644 --- a/engines/tsage/blue_force/blueforce_dialogs.cpp +++ b/engines/tsage/blue_force/blueforce_dialogs.cpp @@ -20,8 +20,6 @@ * */ -#include "common/translation.h" - #include "gui/dialog.h" #include "gui/widget.h" diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp index 226a943f08..1dd3bc158b 100644 --- a/engines/tsage/ringworld/ringworld_dialogs.cpp +++ b/engines/tsage/ringworld/ringworld_dialogs.cpp @@ -20,8 +20,6 @@ * */ -#include "common/translation.h" - #include "gui/dialog.h" #include "gui/widget.h" diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index 99188c1ab6..99913d87b0 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -355,6 +355,11 @@ SceneExt::SceneExt(): Scene() { // to make inter-scene debugging easier, I'm explicitly resetting the _animationCtr // on scene start, since scene objects aren't drawn while it's non-zero R2_GLOBALS._animationCtr = 0; + + // WORKAROUND: We had a case where at some point the number of modal dialogs + // open became incorrect. So reset it on scene changes to fix the problem if + // it ever happens + R2_GLOBALS._insetUp = 0; } void SceneExt::synchronize(Serializer &s) { diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index e2c22bd0b4..ac1bea49b2 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -2210,7 +2210,11 @@ Scene1337::Card::Card() { } void Scene1337::Card::synchronize(Serializer &s) { - warning("STUBBED: Card::synchronize()"); + _card.synchronize(s); + + s.syncAsSint16LE(_cardId); + s.syncAsSint16LE(_stationPos.x); + s.syncAsSint16LE(_stationPos.y); } bool Scene1337::Card::isIn(Common::Point pt) { @@ -2232,7 +2236,26 @@ Scene1337::GameBoardSide::GameBoardSide() { } void Scene1337::GameBoardSide::synchronize(Serializer &s) { - warning("STUBBED: GameBoardSide::synchronize()"); + SceneHotspot::synchronize(s); + + for (int i = 0; i < 4; i++) + _handCard[i].synchronize(s); + + for (int i = 0; i < 8; i++) + _outpostStation[i].synchronize(s); + + _delayCard.synchronize(s); + _emptyStationPos.synchronize(s); + + s.syncAsSint16LE(_card1Pos.x); + s.syncAsSint16LE(_card1Pos.y); + s.syncAsSint16LE(_card2Pos.x); + s.syncAsSint16LE(_card2Pos.y); + s.syncAsSint16LE(_card3Pos.x); + s.syncAsSint16LE(_card3Pos.y); + s.syncAsSint16LE(_card4Pos.x); + s.syncAsSint16LE(_card4Pos.y); + s.syncAsSint16LE(_frameNum); } Scene1337::Scene1337() { @@ -2264,7 +2287,50 @@ Scene1337::Scene1337() { } void Scene1337::synchronize(Serializer &s) { - warning("STUBBED: Scene1337::synchronize()"); + _actionCard1->synchronize(s); + _actionCard2->synchronize(s); + _actionCard3->synchronize(s); + _animatedCard.synchronize(s); + _shuffleAnimation.synchronize(s); + _discardedPlatformCard.synchronize(s); + _selectedCard.synchronize(s); + _discardPile.synchronize(s); + _stockCard.synchronize(s); + _aSound1.synchronize(s); + _aSound2.synchronize(s); + _helpIcon.synchronize(s); + _stockPile.synchronize(s); + _actionItem.synchronize(s); + _currentPlayerArrow.synchronize(s); + + for (int i = 0; i < 4; i++) + _gameBoardSide[i].synchronize(s); + + for (int i = 0; i < 8; i++) { + _upperDisplayCard[i].synchronize(s); + _lowerDisplayCard[i].synchronize(s); + } + + // TODO s.syncPointer(_delayedFunction); + s.syncAsByte(_autoplay); + s.syncAsByte(_shuffleEndedFl); + s.syncAsByte(_showPlayerTurn); + s.syncAsByte(_displayHelpFl); + s.syncAsByte(_instructionsDisplayedFl); + s.syncAsSint16LE(_currentDiscardIndex); + s.syncAsSint16LE(_cardsAvailableNumb); + s.syncAsSint16LE(_currentPlayerNumb); + s.syncAsSint16LE(_actionIdx1); + s.syncAsSint16LE(_actionIdx2); + s.syncAsSint16LE(_winnerId); + s.syncAsSint16LE(_instructionsWaitCount); + s.syncAsSint16LE(_cursorCurRes); + s.syncAsSint16LE(_cursorCurStrip); + s.syncAsSint16LE(_cursorCurFrame); + + for (int i = 0; i < 100; i++) + s.syncAsSint16LE(_availableCardsPile[i]); + } void Scene1337::Action1337::waitFrames(int32 frameCount) { @@ -5938,10 +6004,10 @@ void Scene1337::handlePlayer1() { } int card13Id = findCard13InHand(1); - int tmpVal2 = getPlayerWithOutpost(1); + int victimId = getPlayerWithOutpost(1); - if ((card13Id != -1) && (tmpVal2 != -1)) { - playCounterTrickCard(&_gameBoardSide[1]._handCard[card13Id], tmpVal2); + if ((card13Id != -1) && (victimId != -1)) { + playCounterTrickCard(&_gameBoardSide[1]._handCard[card13Id], victimId); return; } @@ -5954,7 +6020,7 @@ void Scene1337::handlePlayer1() { if ( (_gameBoardSide[rndVal]._handCard[0]._cardId != 0) || (_gameBoardSide[rndVal]._handCard[1]._cardId != 0) || (_gameBoardSide[rndVal]._handCard[2]._cardId != 0) - || (_gameBoardSide[rndVal]._handCard[3]._cardId == 0)) { + || (_gameBoardSide[rndVal]._handCard[3]._cardId != 0)) { playerIdFound = rndVal; break; } @@ -5972,29 +6038,20 @@ void Scene1337::handlePlayer1() { } } - int count = -1; - int i; - for (i = 0; i <= 3; i++) { + for (int i = 0; i <= 3; i++) { int tmpVal = isDelayCard(_gameBoardSide[1]._handCard[i]._cardId); if (tmpVal != -1) { + victimId = -1; int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3); for (int j = 0; j <= 3; j++) { - //CHECKME: tmpVal or rndVal? - // FIXME: This is probably meant to be rndVal, but not clear... - if (tmpVal < 0 || tmpVal >= ARRAYSIZE(_gameBoardSide)) - error("Scene1337::handlePlayer1() tmpVal:%d out of range 0 to %d", tmpVal, ARRAYSIZE(_gameBoardSide)-1); - - if (tmpVal != 1) { - if ((_gameBoardSide[tmpVal]._delayCard._cardId == 0) && isAttackPossible(tmpVal, _gameBoardSide[1]._handCard[i]._cardId)) - count = tmpVal; + if (rndVal != 1) { + if ((_gameBoardSide[rndVal]._delayCard._cardId == 0) && isAttackPossible(rndVal, _gameBoardSide[1]._handCard[i]._cardId)) + victimId = rndVal; } - if (count < 0 || count >= ARRAYSIZE(_gameBoardSide)) - error("Scene1337::handlePlayer1() count:%d out of range 0 to %d", count, ARRAYSIZE(_gameBoardSide)-1); - - if (count != -1) { - playDelayCard(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[count]._delayCard); + if (victimId != -1) { + playDelayCard(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[victimId]._delayCard); return; } else { rndVal--; @@ -6005,18 +6062,17 @@ void Scene1337::handlePlayer1() { } } - int j; - for (j = 0; j <= 3; j++) { + for (int j = 0; j <= 3; j++) { if (getStationCardId(_gameBoardSide[1]._handCard[j]._cardId) != -1) { - count = -1; + victimId = -1; int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3); for (int l = 0; l <= 3; l++) { if (rndVal != 1) { if ((_gameBoardSide[rndVal]._delayCard._cardId == 0) && (_gameBoardSide[1]._handCard[j]._cardId == 1)) - count = rndVal; + victimId = rndVal; } - if (count != -1) { - playDelayCard(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[count]._delayCard); + if (victimId != -1) { + playDelayCard(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[victimId]._delayCard); return; } else { rndVal--; @@ -6062,7 +6118,6 @@ void Scene1337::handlePlayer3() { } int randIndx = R2_GLOBALS._randomSource.getRandomNumber(3); - if (_gameBoardSide[3]._handCard[randIndx]._cardId == 1) { for (int i = 0; i <= 7; i++) { if ((_gameBoardSide[3]._outpostStation[i]._cardId == 0) && !isStopConstructionCard(_gameBoardSide[3]._delayCard._cardId)) { @@ -6649,7 +6704,7 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) { // FIXME: Use another cursor when possible R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS); } else { - // TODO: The original was using some ressource caching, which was useless and complex + // TODO: The original was using some resource caching, which was useless and complex // and which has been removed. This cursor behavior clearly made intensive use of this caching... // We now have to find a way to cache these cursor pointers and avoid loading them multiple times per seconds uint size; @@ -6668,7 +6723,9 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) { void Scene1337::subD18F5() { if (R2_GLOBALS._v57709 == 0) - R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS); + // The original restores a copy of the default cursor (the hand), which isn't possible with our implementation + // We reload of that cursor instead. + setCursorData(5, 1, 4); ++R2_GLOBALS._v57709; } @@ -6676,7 +6733,7 @@ void Scene1337::subD18F5() { void Scene1337::subD1917() { if (R2_GLOBALS._v57709 != 0) { R2_GLOBALS._v57709--; - if (R2_GLOBALS._v57709 != 0) { + if (R2_GLOBALS._v57709 == 0) { // The original was using an intermediate function to call setCursorData. // It has been removed to improve readability setCursorData(5, _cursorCurStrip, _cursorCurFrame); diff --git a/engines/wintermute/POTFILES b/engines/wintermute/POTFILES new file mode 100644 index 0000000000..e9422415b2 --- /dev/null +++ b/engines/wintermute/POTFILES @@ -0,0 +1 @@ +engines/wintermute/detection.cpp diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp index fa452cc0d6..b5b12d55f9 100644 --- a/engines/wintermute/base/sound/base_sound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -89,7 +89,7 @@ bool BaseSound::setSoundSimple() { _sound->setLooping(_soundLooping); _sound->setPrivateVolume(_soundPrivateVolume); _sound->setLoopStart(_soundLoopStart); - _sound->_freezePaused = _soundFreezePaused; + _sound->setFreezePaused(_soundFreezePaused); if (_soundPlaying) { return _sound->resume(); } else { @@ -130,7 +130,7 @@ bool BaseSound::pause(bool freezePaused) { if (_sound) { _soundPaused = true; if (freezePaused) { - _sound->_freezePaused = true; + _sound->setFreezePaused(true); } return _sound->pause(); } else { @@ -150,13 +150,13 @@ bool BaseSound::resume() { bool BaseSound::persist(BasePersistenceManager *persistMgr) { if (persistMgr->getIsSaving() && _sound) { _soundPlaying = _sound->isPlaying(); - _soundLooping = _sound->_looping; - _soundPrivateVolume = _sound->_privateVolume; + _soundLooping = _sound->isLooping(); + _soundPrivateVolume = _sound->getPrivateVolume(); if (_soundPlaying) { _soundPosition = _sound->getPosition(); } - _soundLoopStart = _sound->_loopStart; - _soundFreezePaused = _sound->_freezePaused; + _soundLoopStart = _sound->getLoopStart(); + _soundFreezePaused = _sound->isFreezePaused(); } if (persistMgr->getIsSaving()) { @@ -232,7 +232,7 @@ bool BaseSound::setPrivateVolume(int volume) { if (!_sound) { return STATUS_FAILED; } else { - _sound->_privateVolume = volume; + _sound->setPrivateVolume(volume); return STATUS_OK; } } @@ -241,7 +241,7 @@ int BaseSound::getVolumePercent() { if (!_sound) { return 0; } else { - return _sound->_privateVolume * 100 / 255; + return _sound->getPrivateVolume() * 100 / 255; } } @@ -249,7 +249,7 @@ int BaseSound::getVolume() { if (!_sound) { return 0; } else { - return _sound->_privateVolume; + return _sound->getPrivateVolume(); } } diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index 73287c94f0..5fdac12cef 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -301,4 +301,24 @@ bool BaseSoundBuffer::applyFX(TSFXType type, float param1, float param2, float p return STATUS_OK; } +int32 BaseSoundBuffer::getPrivateVolume() const { + return _privateVolume; +} + +bool BaseSoundBuffer::isLooping() const { + return _looping; +} + +bool BaseSoundBuffer::isFreezePaused() const { + return _freezePaused; +} + +void BaseSoundBuffer::setFreezePaused(bool freezePaused) { + _freezePaused = freezePaused; +} + +Audio::Mixer::SoundType BaseSoundBuffer::getType() const { + return _type; +} + } // End of namespace Wintermute diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 94bc8dc6ad..b3f3046674 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -71,23 +71,26 @@ public: void updateVolume(); void setType(Audio::Mixer::SoundType Type); + Audio::Mixer::SoundType getType() const; bool loadFromFile(const Common::String &filename, bool forceReload = false); void setStreaming(bool streamed, uint32 numBlocks = 0, uint32 blockSize = 0); bool applyFX(TSFXType type, float param1, float param2, float param3, float param4); - + int32 getPrivateVolume() const; + void setFreezePaused(bool freezePaused); + bool isFreezePaused() const; + bool isLooping() const; //HSTREAM _stream; //HSYNC _sync; + +private: + Audio::Mixer::SoundType _type; Audio::SeekableAudioStream *_stream; Audio::SoundHandle *_handle; - bool _freezePaused; - uint32 _loopStart; - Audio::Mixer::SoundType _type; bool _looping; - int32 _privateVolume; -private: + uint32 _loopStart; uint32 _startPos; Common::String _filename; bool _streamed; diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 41cfe5ea62..f1e0c3b1f9 100644 --- a/engines/wintermute/base/sound/base_sound_manager.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -254,9 +254,9 @@ byte BaseSoundMgr::getMasterVolume() { bool BaseSoundMgr::pauseAll(bool includingMusic) { for (uint32 i = 0; i < _sounds.size(); i++) { - if (_sounds[i]->isPlaying() && (_sounds[i]->_type != Audio::Mixer::kMusicSoundType || includingMusic)) { + if (_sounds[i]->isPlaying() && (_sounds[i]->getType() != Audio::Mixer::kMusicSoundType || includingMusic)) { _sounds[i]->pause(); - _sounds[i]->_freezePaused = true; + _sounds[i]->setFreezePaused(true); } } @@ -268,9 +268,9 @@ bool BaseSoundMgr::pauseAll(bool includingMusic) { bool BaseSoundMgr::resumeAll() { for (uint32 i = 0; i < _sounds.size(); i++) { - if (_sounds[i]->_freezePaused) { + if (_sounds[i]->isFreezePaused()) { _sounds[i]->resume(); - _sounds[i]->_freezePaused = false; + _sounds[i]->setFreezePaused(false); } } diff --git a/engines/zvision/POTFILES b/engines/zvision/POTFILES new file mode 100644 index 0000000000..48e2782648 --- /dev/null +++ b/engines/zvision/POTFILES @@ -0,0 +1 @@ +engines/zvision/detection.cpp diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex 90eac48c84..abd745bb2b 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/icons/scummvm_drawer.info b/icons/scummvm_drawer.info Binary files differnew file mode 100644 index 0000000000..26f6a8633d --- /dev/null +++ b/icons/scummvm_drawer.info diff --git a/po/be_BY.po b/po/be_BY.po index a0ae61c9c7..868ade94fb 100644 --- a/po/be_BY.po +++ b/po/be_BY.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.7.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-02 17:22+0300\n" "Last-Translator: Ivan Lukyanov <greencis@mail.ru>\n" "Language-Team: Ivan Lukyanov <greencis@mail.ru>\n" @@ -110,12 +110,14 @@ msgstr "Прызначыць" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -454,7 +456,7 @@ msgstr "Пошук:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Загрузіць гульню:" @@ -463,7 +465,7 @@ msgstr "Загрузіць гульню:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Загрузіць" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Так" @@ -490,6 +493,7 @@ msgstr "Так" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Не" @@ -1271,8 +1275,9 @@ msgstr "Г~а~лоўнае меню" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Захаваць гульню:" @@ -1282,9 +1287,10 @@ msgstr "Захаваць гульню:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Захаваць" @@ -1309,12 +1315,12 @@ msgstr "" "дапамогу." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~О~К" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~А~дмена" @@ -2080,26 +2086,28 @@ msgstr "Пстрычкі выключаны" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Выкарыстоўваць арыгінальныя экраны запісу/чытанні гульні" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Выкарыстоўваць арыгінальныя экраны запісу і захавання гульні замест " "зробленых у ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Узнавіць гульню:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Узнавіць" @@ -2141,6 +2149,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Файл застаўкі '%s' не знойдзены!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Рэжым пстрычкі" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2167,11 +2184,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Малюе графіку з выкарыстаннем яркай палітры гульні" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Не атрымалася загрузіць захаваную гульню з файла." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Не атрымалася захаваць гульню ў файл." @@ -2191,6 +2209,14 @@ msgstr "Прайгравае відэа на павялічанай хуткасці" msgid "Failed to save game" msgstr "Не атрымалася захаваць гульню" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2312,6 +2338,35 @@ msgstr "" "можа так атрымацца, што некаторыя трэкі будуць\n" "сыграныя няправільна." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2439,6 +2494,14 @@ msgstr "Паказаць/схаваць інфаэкран" msgid "Display/Hide Pause Menu" msgstr "Паказаць/схаваць меню паўзы" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Альтэрнатыўны ўступ" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Выкарыстоўваць альтэрнатыўны ўступ (толькі для CD версіі гульні)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA без растру" @@ -3142,6 +3205,18 @@ msgstr "" "ўмее. Каб згуляць, націсніце 'Новая гульня' у стартавым меню ScummVM, а " "затым абярыце дырэкторыю Maniac у дырэкторыі з гульнёй Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3255,6 +3330,14 @@ msgstr "" "Файл teenagent.dat зжаты, але zlib не ўключана ў гэту праграму. Калі ласка, " "распакуйце яго" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Знойдзены застаўкі ў фармаце MPEG-2, але ScummVM быў сабраны без " @@ -3276,12 +3359,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Стандартны растарызатар (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Альтэрнатыўны ўступ" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Выкарыстоўваць альтэрнатыўны ўступ (толькі для CD версіі гульні)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Застаўкі ў фармаце MPEG2 больш не падтрымліваюцца" diff --git a/po/ca_ES.po b/po/ca_ES.po index c80564a6c3..86f8bbed86 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2013-05-05 14:16+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" @@ -107,12 +107,14 @@ msgstr "Assigna" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "D'acord" @@ -454,7 +456,7 @@ msgstr "Cerca:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Carrega partida:" @@ -463,7 +465,7 @@ msgstr "Carrega partida:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Carrega" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Sэ" @@ -490,6 +493,7 @@ msgstr "Sэ" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "No" @@ -1279,8 +1283,9 @@ msgstr "~R~etorna al Llanчador" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Desa la partida:" @@ -1290,9 +1295,10 @@ msgstr "Desa la partida:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Desa" @@ -1315,12 +1321,12 @@ msgstr "" "informaciѓ bрsica i les instruccions sobre com obtenir mщs assistшncia." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~D~'acord" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelЗla" @@ -2085,25 +2091,27 @@ msgstr "Clicat desactivat" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Utilitza les pantalles originals de desat/cрrrega" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utilitza les pantalles originals de desat/cрrrega, en lloc de les de ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Recupera la partida:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Restaura" @@ -2145,6 +2153,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "No s'ha trobat el fitxer d'escena '%s'!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Mode clic" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2172,11 +2189,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Mostra els grрfics utilitzant la paleta brillant del joc" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "No s'ha pogut carregar l'estat del joc del fitxer." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "No s'ha pogut desar l'estat del joc al fitxer." @@ -2196,6 +2214,14 @@ msgstr "Reprodueix les pelЗlэcules a major velocitat" msgid "Failed to save game" msgstr "No s'ha pogut desar l'estat del joc" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2316,6 +2342,35 @@ msgstr "" "Roland MT32 als de General MIDI. Щs possible\n" "que algunes pistes no es reprodueixin correctament." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2444,6 +2499,14 @@ msgstr "Mostra/Oculta la pantalla d'informaciѓ" msgid "Display/Hide Pause Menu" msgstr "Mostra/Oculta el menњ de pausa" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Introducciѓ alternativa" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Utilitza una introducciѓ del joc alternativa (nomщs per la versiѓ CD)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Elimina el tramat d'EGA" @@ -3147,6 +3210,18 @@ msgstr "" "fa encara. Per jugar-hi, aneu a 'Afegir joc' al menњ principal de ScummVM i " "seleccioneu el directori 'Maniac' de dins del directori del joc Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3263,6 +3338,14 @@ msgstr "" "El fitxer teenagent.dat estр comprimit perђ aquest executable no contщ zlib. " "Descomprimiu-lo, si us plau." +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #, fuzzy #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" @@ -3285,13 +3368,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Estрndard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Introducciѓ alternativa" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "" -#~ "Utilitza una introducciѓ del joc alternativa (nomщs per la versiѓ CD)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Les escenes MPEG2 ja no estan suportades" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 0eee65ba1c..0b5a3c88bf 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.7.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-02-27 21:43+0100\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" @@ -111,12 +111,14 @@ msgstr "Mapovat" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -453,7 +455,7 @@ msgstr "Hledat:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Nahrсt hru:" @@ -462,7 +464,7 @@ msgstr "Nahrсt hru:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Nahrсt" @@ -480,6 +482,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ano" @@ -489,6 +492,7 @@ msgstr "Ano" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Ne" @@ -1267,8 +1271,9 @@ msgstr "~N~сvrat do SpouЙtьшe" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "UloОit hru:" @@ -1278,9 +1283,10 @@ msgstr "UloОit hru:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "UloОit" @@ -1304,12 +1310,12 @@ msgstr "" "informace a pokyny k zэskсnэ dalЙэ podpory." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~Z~ruЙit" @@ -2075,24 +2081,26 @@ msgstr "Kliknutэ Zakсzсno" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ mэsto ze ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Obnovit hru" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Obnovit" @@ -2134,6 +2142,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Soubor videa '%s' nenalezen'" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "ReОim kliknutэ" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2161,11 +2178,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Zobrazit grafiku pomocэ jasnщ palety hry" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Nelze naшэst stav hry ze souboru." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Nelze uloОit stav hry do souboru." @@ -2185,6 +2203,14 @@ msgstr "Pјehrсt videa se zv§Йenou rychlostэ" msgid "Failed to save game" msgstr "Nelze uloОit hru." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2305,6 +2331,35 @@ msgstr "" "ty od General MIDI. Je stсle moОnщ, Оe\n" "nьkterщ stopy nebudou znэt sprсvnь." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2432,6 +2487,14 @@ msgstr "Zobrazit/Skr§to obrazovku informacэ" msgid "Display/Hide Pause Menu" msgstr "Zobrazit/Skr§t " +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternativnэ њvod" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "PouОэt jinou verzi њvodu (Pouze verze CD)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Nerozklсdсnэ EGA" @@ -3130,6 +3193,18 @@ msgstr "" "Abyste toto mohli hrсt, pјejdьte do 'Pјidat Hru' v poшсteшnэm menu ScummVM a " "vyberte adresсј 'Maniac' uvnitј hernэho adresсјe Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3238,6 +3313,14 @@ msgstr "" "Soubor teenagent.dat je komprimovсn a zlib nenэ souшсstэ spustitelnщho " "souboru. Prosэm dekomprimujte ho" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "Videa MPEG-2 nalezena, ale ScummVM byl sestaven bez MPEG-2" @@ -3256,12 +3339,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standardnэ (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternativnэ њvod" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "PouОэt jinou verzi њvodu (Pouze verze CD)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Videa MPGE2 jiО nejsou podporovсna" diff --git a/po/da_DA.po b/po/da_DA.po index 65abad2f9e..480e2005d0 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-09 17:34+0100\n" "Last-Translator: Steffen Nyeland <steffen@nyeland.dk>\n" "Language-Team: Steffen Nyeland <steffen@nyeland.dk>\n" @@ -109,12 +109,14 @@ msgstr "Kortlцg" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -453,7 +455,7 @@ msgstr "Sјg:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Indlцs spil:" @@ -462,7 +464,7 @@ msgstr "Indlцs spil:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Indlцs" @@ -480,6 +482,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ja" @@ -489,6 +492,7 @@ msgstr "Ja" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nej" @@ -1267,8 +1271,9 @@ msgstr "~R~etur til oversigt" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Gemmer:" @@ -1278,9 +1283,10 @@ msgstr "Gemmer:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Gem" @@ -1304,12 +1310,12 @@ msgstr "" "oplysninger, og for at fх instruktioner om, hvordan man fхr yderligere hjцlp." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~F~ortryd" @@ -2074,24 +2080,26 @@ msgstr "Klik deaktiveret" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Brug original gem/indlцs skцrme" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Brug de originale gem/indlцs skцrme, istedet for dem fra ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Gendan spil:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Gendan" @@ -2133,6 +2141,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Filmsekvens fil '%s' ikke fundet!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klik tilstand" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2160,11 +2177,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Vis grafik ved hjцlp af spillets lyse palette" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Mislykkedes at indlцse spil tilstand fra fil." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Mislykkedes at gemme spil tilstand til fil." @@ -2184,6 +2202,14 @@ msgstr "Afspil film med forhјjet hastighed" msgid "Failed to save game" msgstr "Mislykkedes at gemme spil" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2304,6 +2330,35 @@ msgstr "" "dem i Generel MIDI. Trods det kan det ske\n" "at nogle stykker ikke lyder korrekt." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2433,6 +2488,14 @@ msgstr "Vis/Skjul Info skцrm" msgid "Display/Hide Pause Menu" msgstr "Vis/Skjul Pause menu" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternativ intro" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Brug en alternativ spil intro (kun CD version)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA farveforјgelse" @@ -3132,6 +3195,18 @@ msgstr "" "endnu. For at spille det, gх til 'Tilfјj spil' i ScummVM start-menuen og " "vцlg 'Maniac' mappen inde i Tentacle spillets mappe." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3243,6 +3318,14 @@ msgstr "" "Teenagent.dat filen er komprimeret og zlib er ikke blevet inkluderet i dette " "program. Udpak den venligst" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "MPEG-2 filmsekvenser fundet, men ScummVM er bygget uden MPEG-2" @@ -3260,12 +3343,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternativ intro" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Brug en alternativ spil intro (kun CD version)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "MPEG2 filmsekvenser understјttes ikke lцngere" diff --git a/po/de_DE.po b/po/de_DE.po index 3fb083d8a2..c127f109bf 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-06-14 19:34+0100\n" "Last-Translator: Simon Sawatzki <SimSaw@gmx.de>\n" "Language-Team: Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari (retired)\n" @@ -108,12 +108,14 @@ msgstr "Zuweisen" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -454,7 +456,7 @@ msgstr "Suchen:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Spiel laden:" @@ -463,7 +465,7 @@ msgstr "Spiel laden:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Laden" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ja" @@ -490,6 +493,7 @@ msgstr "Ja" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nein" @@ -1284,8 +1288,9 @@ msgstr "Zur Spiele~l~iste" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Speichern:" @@ -1295,9 +1300,10 @@ msgstr "Speichern:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Speichern" @@ -1320,12 +1326,12 @@ msgstr "" "Datei fќr grundlegende Informationen und Anweisungen zu weiterer Hilfe." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~bbrechen" @@ -2095,25 +2101,27 @@ msgstr "Klicken deaktiviert" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Originale Spielstand-Menќs" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Verwendet die originalen Menќs zum Speichern und Laden statt der von ScummVM." #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Spiel laden:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Laden" @@ -2155,6 +2163,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Zwischensequenz \"%s\" nicht gefunden!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klickmodus" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2182,11 +2199,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Zeigt Grafiken ќber helle Spielpalette an." #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Konnte Spielstand aus Datei nicht laden." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Konnte Spielstand nicht in Datei speichern." @@ -2206,6 +2224,14 @@ msgstr "Spielt Filme mit erhіhter Geschwindigkeit ab." msgid "Failed to save game" msgstr "Konnte Spielstand nicht speichern." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2328,6 +2354,35 @@ msgstr "" "mіglich, dass ein paar Musikstќcke nicht\n" "richtig abgespielt werden." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2459,6 +2514,14 @@ msgstr "Info-Bildschirm anzeigen/verbergen" msgid "Display/Hide Pause Menu" msgstr "Pause-Menќ anzeigen/verbergen" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternativer Vorspann" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Verwendet einen alternativen Vorspann (nur bei CD-Version)." + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Antifehlerdiffusion fќr EGA" @@ -3163,6 +3226,18 @@ msgstr "" "im Startmenќ von ScummVM und wфhlen das Verzeichnis \"Maniac\" im " "Verzeichnis dieses Spiels aus." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3282,6 +3357,14 @@ msgstr "" "Die Datei teenagent.dat ist gepackt und zlib zum Entpacken wurde in dieser " "ausfќhrbaren Datei nicht miteingebunden. Bitte entpacken Sie die Datei." +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "MPEG-2-Zwischensequenzen gefunden, aber ScummVM wurde ohne Unterstќtzung " @@ -3303,12 +3386,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternativer Vorspann" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Verwendet einen alternativen Vorspann (nur bei CD-Version)." - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "MPEG2-Zwischensequenzen werden nicht mehr unterstќtzt." diff --git a/po/es_ES.po b/po/es_ES.po index 312eeed5f1..479747bb20 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-06 20:39+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -108,12 +108,14 @@ msgstr "Asignar" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "Aceptar" @@ -452,7 +454,7 @@ msgstr "Buscar:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Cargar juego:" @@ -461,7 +463,7 @@ msgstr "Cargar juego:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Cargar" @@ -479,6 +481,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Sэ" @@ -488,6 +491,7 @@ msgstr "Sэ" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "No" @@ -1273,8 +1277,9 @@ msgstr "~V~olver al lanzador" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Guardar partida" @@ -1284,9 +1289,10 @@ msgstr "Guardar partida" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Guardar" @@ -1311,12 +1317,12 @@ msgstr "" "obtener mсs ayuda." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~S~э" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelar" @@ -2082,25 +2088,27 @@ msgstr "Clic desactivado" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Usar pantallas de guardar/cargar originales" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utilizar las pantallas de guardar/cargar originales, en vez de las de ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Cargar partida:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Cargar" @@ -2142,6 +2150,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "No se ha encontrado el vэdeo '%s'" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Modo clic" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2169,11 +2186,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Utilizar los niveles de brillo originales del juego" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Fallo al cargar el estado del juego desde el archivo." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Fallo al guardar el estado del juego en el archivo." @@ -2193,6 +2211,14 @@ msgstr "Reproducir vэdeos a mayor velocidad" msgid "Failed to save game" msgstr "Fallo al guardar la partida" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2313,6 +2339,35 @@ msgstr "" "a los de General MIDI, pero es posible que algunas\n" "de las pistas no suenen correctamente." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2442,6 +2497,15 @@ msgstr "Mostrar/Ocultar pantalla de informaciѓn" msgid "Display/Hide Pause Menu" msgstr "Mostrar/Ocultar menњ de pausa" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Introducciѓn alternativa" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "" +"Usa una introducciѓn alternativa para el juego (solo para la versiѓn CD)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Difuminado EGA" @@ -3142,6 +3206,18 @@ msgstr "" "permite. Para jugar, ve a 'Aёadir juego' en el menњ de inicio de ScummVM y " "selecciona el directorio 'Maniac', dentro del directorio de DOTT." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3259,6 +3335,14 @@ msgstr "" "El archivo teenagent.dat estс comprimido y este ejecutable no incluye zlib. " "Por favor, descomprэmelo" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Se han encontrado vэdeos MPEG-2, pero se ha compilado ScummVM sin MPEG-2" @@ -3278,13 +3362,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Estсndar (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Introducciѓn alternativa" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "" -#~ "Usa una introducciѓn alternativa para el juego (solo para la versiѓn CD)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Los vэdeos MPEG2 ya no son compatibles" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2011-12-15 14:53+0100\n" "Last-Translator: Mikel Iturbe Urretxa <mikel@hamahiru.org>\n" "Language-Team: Librezale <librezale@librezale.org>\n" @@ -108,12 +108,14 @@ msgstr "Esleitu" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "Ados" @@ -452,7 +454,7 @@ msgstr "Bilatu:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Jokoa kargatu:" @@ -461,7 +463,7 @@ msgstr "Jokoa kargatu:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Kargatu" @@ -479,6 +481,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Bai" @@ -488,6 +491,7 @@ msgstr "Bai" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Ez" @@ -1281,8 +1285,9 @@ msgstr "It~z~uli abiarazlera" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Gorde jokoa:" @@ -1292,9 +1297,10 @@ msgstr "Gorde jokoa:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Gorde" @@ -1317,12 +1323,12 @@ msgstr "" "informaziorako eta laguntza gehiago nola jaso jakiteko." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~A~dos" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~U~tzi" @@ -2089,24 +2095,26 @@ msgstr "Klikatzea desgaituta" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Jokoa kargatu:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Kargatu" @@ -2148,6 +2156,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "'%s' bideo fitxategia ez da aurkitu!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klikatzeko modua" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 #, fuzzy msgid "" @@ -2177,11 +2194,12 @@ msgid "Display graphics using the game's bright palette" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Ezin izan da fitxategitik jokoa kargatu." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Ezin izan da jokoa fitxategira gorde." @@ -2202,6 +2220,14 @@ msgstr "" msgid "Failed to save game" msgstr "Ezin izan da jokoa gorde" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2325,6 +2351,35 @@ msgstr "" "General MIDIkoetara egokitzen saiatuko gara,\n" "baina posible da pista batzuk egoki ez entzutea." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2454,6 +2509,14 @@ msgstr "" msgid "Display/Hide Pause Menu" msgstr "" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA lausotzea" @@ -3153,6 +3216,18 @@ msgstr "" "baimentzen oraindik. Jolasteko , joan 'Jokoa gehitu' hasierako menura eta " "aukeratu 'Maniac' direktorioa Tentacle-ren joko-direktorioaren barruan." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3264,6 +3339,14 @@ msgid "" "executable. Please decompress it" msgstr "" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #, fuzzy #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 4a34148f39..1958be3139 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2012-12-01 19:37+0200\n" "Last-Translator: Toni Saarela <saarela@gmail.com>\n" "Language-Team: Finnish\n" @@ -109,12 +109,14 @@ msgstr "Nфppфinkartta" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "Tallenna" @@ -453,7 +455,7 @@ msgstr "Etsi:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Lataa peli:" @@ -462,7 +464,7 @@ msgstr "Lataa peli:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Lataa" @@ -480,6 +482,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Kyllф" @@ -489,6 +492,7 @@ msgstr "Kyllф" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Ei" @@ -1281,8 +1285,9 @@ msgstr "Palaa p~e~livalitsimeen" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Tallenna peli:" @@ -1292,9 +1297,10 @@ msgstr "Tallenna peli:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Tallenna" @@ -1317,12 +1323,12 @@ msgstr "" "lisфtietoa." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~H~yvфksy" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~P~eruuta" @@ -2090,24 +2096,26 @@ msgstr "Klikkaus pois pффltф" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja, ScummVM valikoiden sijaan" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Lataa pelitallenne:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Lataa tallenne" @@ -2149,6 +2157,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Videotiedostoa '%s' ei lіytynyt!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klikkaus moodi" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 #, fuzzy msgid "" @@ -2175,11 +2192,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Nфytф grafiikat kфyttфen pelin kirkasta palettia" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Pelitallenteen lataaminen tiedostosta epфonnistui." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Pelin tallentaminen tiedostoon epфonnistui." @@ -2200,6 +2218,14 @@ msgstr "" msgid "Failed to save game" msgstr "Pelin tallentaminen epфonnistui." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2318,6 +2344,35 @@ msgstr "" "tukee vain Roland MT-32:sta. Jotkut ффniraidat\n" "eivфt ehkф kuulosta siltф miltф niiden pitфisi." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2445,6 +2500,14 @@ msgstr "" msgid "Display/Hide Pause Menu" msgstr "" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Vaihtoehtoinen intro" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Kфytф vaihtoehtoista pelin introa (vain CD versiossa)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA unditterіinti" @@ -3144,6 +3207,18 @@ msgstr "" "Pelataksesi Maniac Mansionia, mene ScummVM:n pффvalikkoon ja paina 'Lisфф " "peli'. Valitse 'Maniac' hakemisto Tentacle hakemiston sisфltф." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3255,6 +3330,14 @@ msgstr "" "Tiedosto teenagent.dat on pakattu, mutta zlib-kirjastoa ei ole kффnnetty " "ScummVM:ффn. Pura teenagent.dat." +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #, fuzzy #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "PSX videoita lіydetty, mutta ScummVM on kффnnetty ilman RGB tukea" @@ -3273,12 +3356,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standardi (16 bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Vaihtoehtoinen intro" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Kфytф vaihtoehtoista pelin introa (vain CD versiossa)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "MPEG2 videotiedostoja ei enфф tueta" diff --git a/po/fr_FR.po b/po/fr_FR.po index 300882ff94..6e47183fe3 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-05 13:49-0000\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <scummvm-devel@lists.sf.net>\n" @@ -109,12 +109,14 @@ msgstr "Affecter" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -454,7 +456,7 @@ msgstr "Filtre:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Charger le jeu:" @@ -463,7 +465,7 @@ msgstr "Charger le jeu:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Charger" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Oui" @@ -490,6 +493,7 @@ msgstr "Oui" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Non" @@ -1280,8 +1284,9 @@ msgstr "Retour au ~L~anceur" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Sauvegarde:" @@ -1291,9 +1296,10 @@ msgstr "Sauvegarde:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Sauver" @@ -1317,12 +1323,12 @@ msgstr "" "de base et les instructions pour obtenir de l'aide supplщmentaire." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nnuler" @@ -2088,26 +2094,28 @@ msgstr "Clic Dщsactivщ" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Dialogues sauvegarde/chargement d'origine" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utiliser les dialogues sauvegarde/chargement d'origine plutєt que ceux de " "ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Charger le jeu:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Charger" @@ -2149,6 +2157,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Fichier de sщquence '%s' non trouvщ!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Mode Clic" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2176,11 +2193,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Utiliser la palette lumineuse du jeu pour l'affichage" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Щchec du chargement de l'щtat du jeu depuis le disque." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Щchec de l'enregistrement de l'щtat du jeu sur le disque." @@ -2200,6 +2218,14 @@ msgstr "Joue les vidщos plus rapidement" msgid "Failed to save game" msgstr "Щchec de la sauvegarde." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2320,6 +2346,35 @@ msgstr "" "MIDI. Cependant il est possible que quelques pistes ne soient\n" " pas jouщes correctement." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2449,6 +2504,14 @@ msgstr "Montrer/Cacher l'Щcran d'Info" msgid "Display/Hide Pause Menu" msgstr "Montrer/Cacher le Menu de Pause" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Intro alternative" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Utiliser une intro alternative (version CD uniquement)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Dщtramage EGA" @@ -3152,6 +3215,18 @@ msgstr "" "choisissez 'Ajouter...' dans le Lanceur de ScummVM et sщlectionnez le " "rщpertoire 'Maniac Mansion' dans le rщpertoire du jeu Day Of The Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3269,6 +3344,14 @@ msgstr "" "Le fichier teenagent.dat est compressщ et cet exщcutable n'inclus pas zlib. " "Veuillez le dщcompresser." +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Scшnes cinщmatiques MPEG-2 dщtectщes mais ScummVM a щtщ compilщ sans le " @@ -3288,12 +3371,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Intro alternative" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Utiliser une intro alternative (version CD uniquement)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Les sщquences MPEG2 ne sont plus supportщes" diff --git a/po/gl_ES.po b/po/gl_ES.po index cb2b7b31c9..cc8569d2f1 100644 --- a/po/gl_ES.po +++ b/po/gl_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-02 09:51+0100\n" "Last-Translator: Santiago G. Sanz <s.sanz@uvigo.es>\n" "Language-Team: Santiago G. Sanz <s.sanz@uvigo.es>\n" @@ -108,12 +108,14 @@ msgstr "Asignar" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "Aceptar" @@ -450,7 +452,7 @@ msgstr "Buscar:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Cargar partida:" @@ -459,7 +461,7 @@ msgstr "Cargar partida:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Cargar" @@ -477,6 +479,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Si" @@ -486,6 +489,7 @@ msgstr "Si" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Non" @@ -1267,8 +1271,9 @@ msgstr "~V~olver ao Iniciador" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Gardar partida:" @@ -1278,9 +1283,10 @@ msgstr "Gardar partida:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Gardar" @@ -1304,12 +1310,12 @@ msgstr "" "bсsica e mсis instruciѓns para acadar asistencia adicional." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~A~ceptar" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelar" @@ -2073,25 +2079,27 @@ msgstr "Premer desactivado" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Empregar pantallas orixinais de gardado e carga" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Empregar as pantallas orixinais de gardado e carga, no canto das de ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Restaurar xogo:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Restaurar" @@ -2133,6 +2141,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Non se atopou o ficheiro de secuencia %s!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Modo rato" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2160,11 +2177,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Mostrar os grсficos coa paletta intensa do xogo" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Erro ao cargar a partida do ficheiro." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Erro ao gardar a partida no ficheiro." @@ -2184,6 +2202,14 @@ msgstr "Reproducir vэdeos a mсis velocidade" msgid "Failed to save game" msgstr "Erro ao gardar a partida" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2304,6 +2330,35 @@ msgstr "" "aos de General MIDI. No entanto, existe a posibilidade\n" "de que algunhas pistas non soen correctamente." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2432,6 +2487,14 @@ msgstr "Mostrar/Ocultar pantalla de informaciѓn" msgid "Display/Hide Pause Menu" msgstr "Mostrar/Ocultar menњ de pausa" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Intro alternativa" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Empregar unha introduciѓn alternativa para o xogo (sѓ versiѓn en CD)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Non interpolaciѓn EGA" @@ -3134,6 +3197,18 @@ msgstr "" "facelo. Para xogar, vai a Engadir xogo no menњ de inicio de ScummVM e " "selecciona o directorio Maniac que estс dentro do directorio Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3249,6 +3324,14 @@ msgstr "" "O ficheiro teenagent.dat estс comprimido e zlib non foi incluэdo neste " "executable. Descomprime o ficheiro" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "Atopсronse secuencias MPEG-2, mais ScummVM foi compilado sen MPEG-2" @@ -3266,13 +3349,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Estсndar (16 bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Intro alternativa" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "" -#~ "Empregar unha introduciѓn alternativa para o xogo (sѓ versiѓn en CD)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Xa non hai compatibilidade coas secuencias en MPEG2" diff --git a/po/hu_HU.po b/po/hu_HU.po index c0648e4602..ef3507be98 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-02-18 06:30+0100\n" "Last-Translator: George Kormendi <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" @@ -110,12 +110,14 @@ msgstr "Kiosztсs" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -452,7 +454,7 @@ msgstr "Keresщs:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Jсtщk betіltщse:" @@ -461,7 +463,7 @@ msgstr "Jсtщk betіltщse:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Betіltщs" @@ -479,6 +481,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Igen" @@ -488,6 +491,7 @@ msgstr "Igen" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nem" @@ -1264,8 +1268,9 @@ msgstr "Visszatщrщs az indэtѓba" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Jсtщk mentщse:" @@ -1275,9 +1280,10 @@ msgstr "Jсtщk mentщse:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Mentщs" @@ -1300,12 +1306,12 @@ msgstr "" "informсciѓkrѓl, щs hogy hogyan segэthetsz a kщsѕbbiekben." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "Mщgse" @@ -2065,24 +2071,26 @@ msgstr "Kattintсs tiltva" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Eredeti ment/tіlt kщpernyѕk hasznсlata" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Az eredeti mentщs/betіltщs kщpernyѕ hasznсlata a ScummVM kщpek helyett" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Jсtщkmenet visszaсllэtсsa:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Visszaсllэtсs" @@ -2124,6 +2132,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "'%s' сtvezetѕ fсjl nem talсlhatѓ" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Kattintсs Mѓd" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2150,11 +2167,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Grafikus megjelenэtщsre hasznсlja a jсtщk fщnyes palettсjсt" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Jсtщkсllсs betіltщse fсjlbѓl nem sikerќlt." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Jсtщkсllсs mentщse fсjlba nem sikerќlt." @@ -2174,6 +2192,14 @@ msgstr "Filmek lejсtszсsa nagyobb sebessщggel" msgid "Failed to save game" msgstr "Jсtщk mentщs nem sikerќlt" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2294,6 +2320,35 @@ msgstr "" "General MIDIre. Tovсbbra is lehetsщges hogy\n" "nщhсny hangsсv helytelenќl hangzik." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2422,6 +2477,14 @@ msgstr "Infѓkщpernyѕ Kщpre/Elrejt" msgid "Display/Hide Pause Menu" msgstr "Szќnet menќ Kщpre/Elrejt" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternatэv intro" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Alternatэv jсtщkintro hasznсlata (csak CD verziѓnсl)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA szinjavэtсs" @@ -3120,6 +3183,18 @@ msgstr "" "jсtszani akarsz vele menj a ScummVM fѕmenќben a 'Jсtщk hozzсadсs' ra щs " "vсlaszd a 'Maniac' mappсt a 'Tentacle' kіnyvtсrсban." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3232,6 +3307,14 @@ msgstr "" "A teenagent.dat fсjl tіmіrэtett щs a zlib nem rщsze ennek a futtathatѓ " "сllomсnynak. Kщrlek tіmіrэtsd ki" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "MPEG-2 сtvezetѕfilmet talсltam, de a ScummVM MPEG-2 nщlkќl van lefordэtva" @@ -3250,12 +3333,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternatэv intro" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Alternatэv jсtщkintro hasznсlata (csak CD verziѓnсl)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "MPEG2 сtvezetѕk mсr nem tсmogatottak" diff --git a/po/it_IT.po b/po/it_IT.po index 27c7ebe3eb..a0192b29bb 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-03 17:59-0600\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" @@ -107,12 +107,14 @@ msgstr "Mappa" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -450,7 +452,7 @@ msgstr "Cerca:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Carica gioco:" @@ -459,7 +461,7 @@ msgstr "Carica gioco:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Carica" @@ -477,6 +479,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Sь" @@ -486,6 +489,7 @@ msgstr "Sь" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "No" @@ -1272,8 +1276,9 @@ msgstr "~V~ai a elenco giochi" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Salva gioco:" @@ -1283,9 +1288,10 @@ msgstr "Salva gioco:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Salva" @@ -1310,12 +1316,12 @@ msgstr "" "assistenza." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nnulla" @@ -2080,26 +2086,28 @@ msgstr "Clic disattivato" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Usa schermate di salvataggio originali" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Usa le schermate originali di salvataggio e caricamento, al posto di quelle " "di ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Ripristina gioco:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Ripristina" @@ -2141,6 +2149,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "File della scena di intermezzo '%s' non trovato!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Modalitр clic" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2168,11 +2185,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Visualizza la grafica con i colori brillanti del gioco" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Impossibile caricare il gioco dal file." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Impossibile salvare il gioco nel file." @@ -2192,6 +2210,14 @@ msgstr "Aumenta la velocitр di riproduzione dei filmati" msgid "Failed to save game" msgstr "Impossibile salvare il gioco" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2312,6 +2338,35 @@ msgstr "" "Roland MT32 in quelli General MIDI. Alcune tracce\n" "potrebbero avere un suono non corretto." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2440,6 +2495,14 @@ msgstr "Mostra/nascondi schermana info" msgid "Display/Hide Pause Menu" msgstr "Mostra/nascondi menu pausa" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Intro alternativa" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Usa un'intro del gioco alternativa (solo versione CD)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Undithering EGA" @@ -3142,6 +3205,18 @@ msgstr "" "principale di ScummVM e seleziona la cartella \"Maniac\" all'interno della " "cartella di Day Of The Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3257,6 +3332,14 @@ msgstr "" "Il file teenagent.dat ш compresso e zlib non ш stata inclusa in questo " "eseguibile. Si prega di decomprimerlo" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Sono state trovare scene di intermezzo MPEG-2 ma ScummVM ш stato " @@ -3278,12 +3361,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Intro alternativa" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Usa un'intro del gioco alternativa (solo versione CD)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Le scene di intermezzo MPEG2 non sono piљ supportate" diff --git a/po/nb_NO.po b/po/nb_NO.po index 172b402324..cf211a46a4 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-11 00:02+0100\n" "Last-Translator: Einar Johan Trјan Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -110,12 +110,14 @@ msgstr "Koble" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -454,7 +456,7 @@ msgstr "Sјk:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Хpne spill:" @@ -463,7 +465,7 @@ msgstr "Хpne spill:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Хpne" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ja" @@ -490,6 +493,7 @@ msgstr "Ja" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nei" @@ -1267,8 +1271,9 @@ msgstr "~T~ilbake til oppstarter" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Lagret spill:" @@ -1278,9 +1283,10 @@ msgstr "Lagret spill:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Lagre" @@ -1304,12 +1310,12 @@ msgstr "" "grunnleggende informasjon og instruksjon om hvordan du fхr ytterligere hjelp." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~vbryt" @@ -2074,24 +2080,26 @@ msgstr "Klikking deaktivert" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Bruk originale lagre/laste-skjermer" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Gjennopprett spill:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Gjenopprett" @@ -2133,6 +2141,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Fant ikke cutscenefil '%s'!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klikkmodus" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2160,11 +2177,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Vis grafikk med spillets lyse palett" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Klarte ikke хpne spilltilstand fra fil." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Klarte ikke lagre spilltilstand fra fil." @@ -2184,6 +2202,14 @@ msgstr "Spill filmer med јkt hastighet" msgid "Failed to save game" msgstr "Klarte ikke х lagre spill." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2305,6 +2331,35 @@ msgstr "" "General MIDI-instrumentene. Allikevel, kan det\n" "skje at enkelte spor ikke vil spilles riktig." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2433,6 +2488,14 @@ msgstr "Vis/Skjul Infoskjerm" msgid "Display/Hide Pause Menu" msgstr "Vis/Skjul Pausemeny" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternativ intro" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Bruk en alternativ intro (Kun for CD-versjon)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA av-dithering" @@ -3132,6 +3195,18 @@ msgstr "" "ennх. Sх, for х spille Maniac Mansion, gх til 'Legg til spill' i ScummVM-" "hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3240,6 +3315,14 @@ msgstr "" "teenagent.dat-fila er komprimert og zlib har ikke blitt inkludert i denne " "programfilen. Vennligst pakk den ut" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "MPEG2-cutscener funnet men ScummVM er bygd uten MPEG2-stјtte" @@ -3257,12 +3340,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternativ intro" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Bruk en alternativ intro (Kun for CD-versjon)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "MPEG2-cutscener stјttes ikke lengre" diff --git a/po/nl_NL.po b/po/nl_NL.po index 2d43470fd5..43ac274ac5 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-09-03 07:42+0100\n" "Last-Translator: Ben Castricum <scummvm@bencastricum.nl>\n" "Language-Team: Ben Castricum <scummvm@bencastricum.nl>\n" @@ -110,12 +110,14 @@ msgstr "Koppel" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -456,7 +458,7 @@ msgstr "Zoeken:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Laad spel:" @@ -465,7 +467,7 @@ msgstr "Laad spel:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Laden" @@ -483,6 +485,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ja" @@ -492,6 +495,7 @@ msgstr "Ja" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nee" @@ -1282,8 +1286,9 @@ msgstr "~T~erug naar startmenu" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Spel opslaan:" @@ -1293,9 +1298,10 @@ msgstr "Spel opslaan:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Opslaan" @@ -1320,12 +1326,12 @@ msgstr "" "assistentie." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nnuleer" @@ -2093,25 +2099,27 @@ msgstr "Klikken Uitgeschakeld" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Gebruik originele opslaan/laad schermen" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Gebruik de originele opslaan/laden schermen, in plaats van die van ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Laad opgeslagen spel:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Laad" @@ -2153,6 +2161,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Cutscene bestand '%s' niet gevonden!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klik Modus" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2180,11 +2197,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Gebruik het heldere palet van het spel voor grafische zaken." #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Laden van opgeslagen spel mislukt." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Opslaan van spel in bestand is mislukt." @@ -2204,6 +2222,14 @@ msgstr "Speel films sneller af" msgid "Failed to save game" msgstr "Opslaan van spel mislukt." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2323,6 +2349,35 @@ msgstr "" "We zullen proberen te Roland MT32 instrumenten te vertalen naar General MIDI " "instrumenten. Het is mogelijk dat somige tracks niet goed klinken." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2453,6 +2508,15 @@ msgstr "Toon/Verberg Infoscherm" msgid "Display/Hide Pause Menu" msgstr "Toon/Verberg Pauze-Menu" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "" + +#: engines/queen/detection.cpp:57 +#, fuzzy +msgid "Use an alternative game intro (CD version only)" +msgstr "Gebruik de floppy versie van de intro (alleen voor de CD versie)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA undithering" @@ -3155,6 +3219,18 @@ msgstr "" "niet. Om het te spelen, ga naar \"Spel Toevoegen\" in het ScummVM start menu " "en selecteer de map 'Maniac' in de Tentacle map." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3267,3 +3343,11 @@ msgid "" msgstr "" "Het \"teenagent.dat\" bestand is gecomprimeerd en zlib is niet meegenomen in " "deze versie van ScummVM. Decomprimeer a.u.b. het bestand." + +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 496b00703b..de5698e61d 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-11 00:04+0100\n" "Last-Translator: Einar Johan Trјan Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -110,12 +110,14 @@ msgstr "Kople" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -455,7 +457,7 @@ msgstr "Sјk:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Хpne spel:" @@ -464,7 +466,7 @@ msgstr "Хpne spel:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Хpne" @@ -480,6 +482,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ja" @@ -489,6 +492,7 @@ msgstr "Ja" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nei" @@ -1266,8 +1270,9 @@ msgstr "Tilbake til Oppsta~r~tar" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Lagra spel:" @@ -1277,9 +1282,10 @@ msgstr "Lagra spel:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Lagre" @@ -1298,12 +1304,12 @@ msgid "" msgstr "" #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~vbryt" @@ -2068,24 +2074,26 @@ msgstr "Klikking Deaktivert" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Nytt opprinnelege skjermar for lagring/lasting" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Gjenopprett spel:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Gjenopprett" @@ -2118,6 +2126,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klikkmodus" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2139,11 +2156,12 @@ msgid "Display graphics using the game's bright palette" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Kunne ikkje laste lagra spel frх fil." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Klarte ikkje lagre speltilstand til fil." @@ -2165,6 +2183,14 @@ msgstr "Spel filmar med auka hastighet" msgid "Failed to save game" msgstr "Lagra spel:" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2293,6 +2319,35 @@ msgid "" "some tracks sound incorrect." msgstr "" +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2413,6 +2468,15 @@ msgstr "Skjul/Vis infoskjerm" msgid "Display/Hide Pause Menu" msgstr "Skjul/Vis pausemeny" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "" + +#: engines/queen/detection.cpp:57 +#, fuzzy +msgid "Use an alternative game intro (CD version only)" +msgstr "Nytt diskettversjonens хpning (Kun CD-versjon)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "" @@ -3111,6 +3175,18 @@ msgstr "" "det enno. For х spele Maniac Mansion, gх til 'Legg til spel' i ScummVM-" "menyen og vel 'Maniac'-undermappa i 'Tentacle'-mappa." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3207,6 +3283,14 @@ msgid "" "executable. Please decompress it" msgstr "" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgctxt "lowres" #~ msgid "Mass Add..." #~ msgstr "Legg til fleire..." diff --git a/po/pl_PL.po b/po/pl_PL.po index bc78909234..83df595da5 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-02 12:28+0100\n" "Last-Translator: MichaГ ZiБbkowski <mziab@o2.pl>\n" "Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n" @@ -111,12 +111,14 @@ msgstr "Przypisz" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -453,7 +455,7 @@ msgstr "Szukaj" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Wczytaj grъ:" @@ -462,7 +464,7 @@ msgstr "Wczytaj grъ:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Wczytaj" @@ -479,6 +481,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Tak" @@ -488,6 +491,7 @@ msgstr "Tak" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nie" @@ -1266,8 +1270,9 @@ msgstr "~P~owrѓt do launchera" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Zapis:" @@ -1277,9 +1282,10 @@ msgstr "Zapis:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Zapisz" @@ -1303,12 +1309,12 @@ msgstr "" "dowiedzieц jak szukaц dalszej pomocy, sprawdМ plik README." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nuluj" @@ -2066,24 +2072,26 @@ msgstr "Klikanie wyГБczone" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu zamiast tych ze ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Wznѓw grъ:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Wznѓw" @@ -2125,6 +2133,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Nie znaleziono pliku przerywnika '%s'!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Tryb klikania" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2151,11 +2168,12 @@ msgid "Display graphics using the game's bright palette" msgstr "WyЖwietlaj grafikъ za pomocБ jasnej palety gry" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Nie udaГo siъ wczytaц stanu gry z pliku." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Nie udaГo siъ zapisaц stanu gry do pliku." @@ -2175,6 +2193,14 @@ msgstr "Odtwarzaj filmy ze zwiъkszonБ prъdkoЖciБ" msgid "Failed to save game" msgstr "Nie udaГo siъ zapisaц stanu gry" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2294,6 +2320,35 @@ msgstr "" "Prѓbujemy przypisaц instrumenty Rolanda MT32 do instrumentѓw General MIDI. " "Niektѓre utwory mogБ byц Мle odtwarzane." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2421,6 +2476,14 @@ msgstr "PokaП/schowaj ekran informacji" msgid "Display/Hide Pause Menu" msgstr "PokaП/schowaj menu pauzy" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternatywne intro" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "UПyj alternatywnego intra (tylko dla wersji CD)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "Anty-dithering EGA" @@ -3121,6 +3184,18 @@ msgstr "" "tego nie obsГuguje. Aby zagraц, uПyj \"Dodaj grъ...\" z menu startowego " "ScummVM i wybierz podkatalog \"Maniac\" z katalogu gry Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3237,6 +3312,14 @@ msgstr "" "Plik teenagent.dat jest skompresowany, a ScummVM nie zawiera obsГugi zlib. " "Rozpakuj plik." +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Znaleziono przerywniki w formacie MPEG-2, ale ScummVM jest skompilowany " @@ -3257,12 +3340,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standardowy (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternatywne intro" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "UПyj alternatywnego intra (tylko dla wersji CD)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Przerywniki w formacie MPEG2 nie sБ juП obsГugiwane" diff --git a/po/pt_BR.po b/po/pt_BR.po index 64d7ff8933..71161bde14 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2011-10-21 21:30-0300\n" "Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n" "Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n" @@ -113,12 +113,14 @@ msgstr "Mapear" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -457,7 +459,7 @@ msgstr "Pesquisar:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Carregar jogo:" @@ -466,7 +468,7 @@ msgstr "Carregar jogo:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Carregar" @@ -484,6 +486,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Sim" @@ -493,6 +496,7 @@ msgstr "Sim" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nуo" @@ -1291,8 +1295,9 @@ msgstr "~V~oltar ao menu" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Salvar jogo:" @@ -1302,9 +1307,10 @@ msgstr "Salvar jogo:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Salvar" @@ -1329,12 +1335,12 @@ msgstr "" "instruчѕes sobre como obter assistъncia adicional." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelar" @@ -2104,24 +2110,26 @@ msgstr "Clicando Desabilitado" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Restaurar jogo:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Restaurar" @@ -2163,6 +2171,14 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Arquivo de vэdeo '%s' nуo encontrado!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +msgid "Color Blind Mode" +msgstr "" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 #, fuzzy msgid "" @@ -2192,14 +2208,15 @@ msgid "Display graphics using the game's bright palette" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 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:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "" "Falha ao salvar o estado do jogo para o arquivo:\n" @@ -2223,6 +2240,14 @@ msgstr "" msgid "Failed to save game" msgstr "Falha ao salvar o jogo" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2352,6 +2377,35 @@ msgstr "" "o modelo General MIDI. Talvez possa acontecer\n" "que algumas faixas nуo sejam corretamente tocadas." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2481,6 +2535,14 @@ msgstr "" msgid "Display/Hide Pause Menu" msgstr "" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA sem dithering" @@ -3182,6 +3244,18 @@ msgstr "" "adicione o jogo normalmente no ScummVM. Ele se encontra em um diretѓrio " "dentro da pasta do jogo Day of the Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3296,6 +3370,14 @@ msgid "" "executable. Please decompress it" msgstr "" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #, fuzzy #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 5c5690a746..89ee15e7ce 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: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-02 17:20+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" @@ -110,12 +110,14 @@ msgstr "Назначить" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -453,7 +455,7 @@ msgstr "Поиск:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Загрузить игру:" @@ -462,7 +464,7 @@ msgstr "Загрузить игру:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Загрузить" @@ -480,6 +482,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Да" @@ -489,6 +492,7 @@ msgstr "Да" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Нет" @@ -1273,8 +1277,9 @@ msgstr "~В~ главное меню" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Сохранить игру:" @@ -1284,9 +1289,10 @@ msgstr "Сохранить игру:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Сохранить" @@ -1311,12 +1317,12 @@ msgstr "" "помощь." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "О~т~мена" @@ -2080,26 +2086,28 @@ msgstr "Щелчки выключены" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Использовать оригинальные экраны записи/чтения игры" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Использовать оригинальные экраны записи и сохранения игры вместо сделанных в " "ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Восстановить игру:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Восстановить" @@ -2141,6 +2149,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Файл заставки '%s' не найден!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Режим щелчка" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2168,11 +2185,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Рисует графику с использованием яркой палитры игры" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Не удалось загрузить сохранённую игру из файла." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Не удалось сохранить игру в файл." @@ -2192,6 +2210,14 @@ msgstr "Воспроизводит видеоролики с увеличенной скоростью" msgid "Failed to save game" msgstr "Не удалось сохранить игру" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2313,6 +2339,35 @@ msgstr "" "может так получиться, что некоторые треки будут\n" "сыграны неверно." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2440,6 +2495,14 @@ msgstr "Показать/Спрятать инфоэкран" msgid "Display/Hide Pause Menu" msgstr "Показать/Спрятать меню паузы" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Альтернативное вступление" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Использовать альтернативное вступление (только для CD версии игры)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA без растра" @@ -3144,6 +3207,18 @@ msgstr "" "умеет. Чтобы сыграть, нажмите 'Новая игра' в стартовом меню ScummVM, а затем " "выберите директорию Maniac внутри директории с игрой Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3256,6 +3331,14 @@ msgstr "" "Файл teenagent.dat сжат, но zlib не включено в эту программу. Пожалуйста, " "распакуйте его" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Найдены заставки в формате MPEG-2, но ScummVM был собран без поддержки " @@ -3277,12 +3360,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Стандартный растеризатор (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Альтернативное вступление" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Использовать альтернативное вступление (только для CD версии игры)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Заставки в формате MPEG2 больше не поддерживаются" diff --git a/po/scummvm.pot b/po/scummvm.pot index 073ddeb029..72600ff994 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -107,12 +108,14 @@ msgstr "" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "" @@ -447,7 +450,7 @@ msgstr "" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "" @@ -456,7 +459,7 @@ msgstr "" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "" @@ -472,6 +475,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "" @@ -481,6 +485,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "" @@ -1247,8 +1252,9 @@ msgstr "" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "" @@ -1258,9 +1264,10 @@ msgstr "" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "" @@ -1279,12 +1286,12 @@ msgid "" msgstr "" #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "" @@ -2021,24 +2028,26 @@ msgstr "" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "" @@ -2071,6 +2080,14 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +msgid "Color Blind Mode" +msgstr "" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2091,11 +2108,12 @@ msgid "Display graphics using the game's bright palette" msgstr "" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "" -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "" @@ -2115,6 +2133,14 @@ msgstr "" msgid "Failed to save game" msgstr "" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2230,6 +2256,35 @@ msgid "" "some tracks sound incorrect." msgstr "" +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2345,6 +2400,14 @@ msgstr "" msgid "Display/Hide Pause Menu" msgstr "" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "" @@ -3036,6 +3099,18 @@ msgid "" "directory inside the Tentacle game directory." msgstr "" +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3128,3 +3203,11 @@ msgid "" "The teenagent.dat file is compressed and zlib hasn't been included in this " "executable. Please decompress it" msgstr "" + +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" diff --git a/po/se_SE.po b/po/se_SE.po index b2da26bc8a..d08f6962c9 100644 --- a/po/se_SE.po +++ b/po/se_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-02 16:30+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" @@ -110,12 +110,14 @@ msgstr "Stфll in" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -454,7 +456,7 @@ msgstr "Sіk:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Ladda spel:" @@ -463,7 +465,7 @@ msgstr "Ladda spel:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Ladda" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Ja" @@ -490,6 +493,7 @@ msgstr "Ja" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Nej" @@ -1272,8 +1276,9 @@ msgstr "Хte~r~vфnd till launcher" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Spara spelet:" @@ -1283,9 +1288,10 @@ msgstr "Spara spelet:" #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Spara" @@ -1309,12 +1315,12 @@ msgstr "" "information och instruktioner fіr hur du kan fх mer hjфlp." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "A~v~bryt" @@ -2079,24 +2085,26 @@ msgstr "Klickning deaktiverad" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Anvфnd originalskфrmar fіr spara/ladda" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Anvфnder originalskфrmarna fіr spara/ladda istфllet fіr ScummVM:s" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Хterstфll spel:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Хterstфll" @@ -2138,6 +2146,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Filmscensfilen '%s' hittades ej!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Klicklфge" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2165,11 +2182,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Visa grafik med spelets ljusa palett" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Kunde inte lфsa spardata frхn filen" -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Kunde inte skriva spardata till filen." @@ -2189,6 +2207,14 @@ msgstr "Spela filmer i hіgre hastighet" msgid "Failed to save game" msgstr "Kunde inte spara spelet." +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2309,6 +2335,35 @@ msgstr "" "General MIDI-instrument. Det kan trots allt hфnda\n" "att ett fхtal ljudspхr inte spelas korrekt." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2437,6 +2492,14 @@ msgstr "Visa/dіlj informationsskфrm" msgid "Display/Hide Pause Menu" msgstr "Visa/dіlj pausmeny" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Alternativt intro" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Anvфnd alternativt spelintro (endast CD-version)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA anti-gitter" @@ -3137,6 +3200,18 @@ msgstr "" "фn. Fіr att spela spelet, gх till \"Lфgg till spel\" i ScummVM:s huvudmeny " "och vфlj \"Maniac\"-katalogen inuti \"Tentacle\" katalogen." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3245,6 +3320,14 @@ msgstr "" "Teenagent.dat-filen фr komprimerad och zlib har inte inkluderats i det hфr " "programmet. Var god dekomprimera den" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "MPEG-2-filmscener hittades men ScummVM har byggts utan MPEG-2" @@ -3263,12 +3346,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Standard (16 bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Alternativt intro" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Anvфnd alternativt spelintro (endast CD-version)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "MPEG2 filmscener stіds inte lфngre" diff --git a/po/uk_UA.po b/po/uk_UA.po index 52427ce3c5..5a7554189e 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2014-09-03 07:39+0200\n" +"POT-Creation-Date: 2014-10-04 00:58+0100\n" "PO-Revision-Date: 2014-07-01 02:34+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Ukrainian\n" @@ -110,12 +110,14 @@ msgstr "Призначити" #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825 -#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545 -#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569 -#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445 -#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471 +#: engines/scumm/players/player_v3m.cpp:130 +#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524 +#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561 +#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425 +#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461 +#: engines/sword2/animation.cpp:471 msgid "OK" msgstr "OK" @@ -454,7 +456,7 @@ msgstr "Пошук:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 #: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718 -#: engines/pegasus/pegasus.cpp:353 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Завантажити гру:" @@ -463,7 +465,7 @@ msgstr "Завантажити гру:" #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245 #: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 +#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Завантажити" @@ -481,6 +483,7 @@ msgstr "" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "Yes" msgstr "Так" @@ -490,6 +493,7 @@ msgstr "Так" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 #: backends/platform/wince/CELauncherDialog.cpp:83 +#: engines/kyra/saveload_eob.cpp:557 engines/kyra/saveload_eob.cpp:590 msgid "No" msgstr "Ні" @@ -1272,8 +1276,9 @@ msgstr "~П~овер.в головне меню" #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 -#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 -#: engines/sci/engine/kfile.cpp:758 engines/toltecs/menu.cpp:281 +#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873 +#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save game:" msgstr "Зберегти гру: " @@ -1283,9 +1288,10 @@ msgstr "Зберегти гру: " #: backends/platform/wince/CEActionsSmartphone.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:231 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212 -#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:873 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758 -#: engines/scumm/dialogs.cpp:188 engines/toltecs/menu.cpp:281 +#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 +#: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188 +#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598 msgid "Save" msgstr "Записати" @@ -1309,12 +1315,12 @@ msgstr "" "основної інормації, а також інструкцій, як отримати подальшу допомогу." #: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 +#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~K" #: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "Ві~д~міна" @@ -2078,25 +2084,27 @@ msgstr "Кліки вимкнено" #: engines/agi/detection.cpp:142 engines/drascula/detection.cpp:302 #: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160 #: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200 +#: engines/zvision/detection.cpp:103 msgid "Use original save/load screens" msgstr "Використовувати ориг. збереження/завантаження екрани" #: engines/agi/detection.cpp:143 engines/drascula/detection.cpp:303 #: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161 #: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201 +#: engines/zvision/detection.cpp:104 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Використовувати оригінальні збереження/завантаження екрани, замість ScummVM" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore game:" msgstr "Відновити гру:" #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349 -#: engines/neverhood/menumodule.cpp:886 engines/sci/engine/kfile.cpp:857 -#: engines/toltecs/menu.cpp:256 +#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886 +#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256 msgid "Restore" msgstr "Відновити" @@ -2138,6 +2146,15 @@ msgstr "" msgid "Cutscene file '%s' not found!" msgstr "Файл ролику '%s' не знайдено!" +#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81 +#, fuzzy +msgid "Color Blind Mode" +msgstr "Режим кліків" + +#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82 +msgid "Enable Color Blind Mode by default" +msgstr "" + #: engines/drascula/saveload.cpp:47 msgid "" "ScummVM found that you have old savefiles for Drascula that should be " @@ -2164,11 +2181,12 @@ msgid "Display graphics using the game's bright palette" msgstr "Відображення графіки з використанням яскравої палітри ігр" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470 -#: engines/tinsel/saveload.cpp:532 +#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532 msgid "Failed to load game state from file." msgstr "Не вдалося завантажити стан гри з файлу." -#: engines/gob/inter_v2.cpp:1540 engines/tinsel/saveload.cpp:545 +#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263 +#: engines/tinsel/saveload.cpp:545 msgid "Failed to save game state to file." msgstr "Не вдалося зберегти стан гри у файл." @@ -2188,6 +2206,14 @@ msgstr "Програвати відео з підвищенною швидкістю" msgid "Failed to save game" msgstr "Не вдалося записати гру" +#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86 +msgid "Gore Mode" +msgstr "" + +#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87 +msgid "Enable Gore Mode when available" +msgstr "" + #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 @@ -2308,6 +2334,35 @@ msgstr "" "MT32 на General MIDI. Але в результаті може\n" "статися, що деякі треки будуть грати неправильно." +#: engines/kyra/saveload_eob.cpp:557 +#, c-format +msgid "" +"The following original save game file has been found in your game path:\n" +"\n" +"%s %s\n" +"\n" +"Do you wish to use this save game file with ScummVM?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:590 +#, c-format +msgid "" +"A save game file was found in the specified slot %d. Overwrite?\n" +"\n" +msgstr "" + +#: engines/kyra/saveload_eob.cpp:623 +#, c-format +msgid "" +"%d original save game files have been successfully imported into\n" +"ScummVM. If you want to manually import original save game files later you " +"will\n" +"need to open the ScummVM debug console and use the command " +"'import_savefile'.\n" +"\n" +msgstr "" + #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 msgid "~Z~ip Mode Activated" @@ -2435,6 +2490,14 @@ msgstr "Показати/Сховати інфоекран" msgid "Display/Hide Pause Menu" msgstr "Показувати/Сховати меню паузи" +#: engines/queen/detection.cpp:56 +msgid "Alternative intro" +msgstr "Алтернативний вступ" + +#: engines/queen/detection.cpp:57 +msgid "Use an alternative game intro (CD version only)" +msgstr "Використовувати альтернативний вступ гри (тільки CD версія)" + #: engines/sci/detection.cpp:374 msgid "EGA undithering" msgstr "EGA без растрування" @@ -3135,6 +3198,18 @@ msgstr "" "вміє. Щоб грати у нього, оберіть 'Додати гру' у початковому меню ScummVM, і " "виберіть папку Maniac всередені пвпки з грою Tentacle." +#: engines/scumm/players/player_v3m.cpp:129 +msgid "" +"Could not find the 'Loom' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + +#: engines/scumm/players/player_v5m.cpp:107 +msgid "" +"Could not find the 'Monkey Island' Macintosh executable to read the\n" +"instruments from. Music will be disabled." +msgstr "" + #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" @@ -3245,6 +3320,14 @@ msgstr "" "Файл teenagent.dat запаковано, але zlib не було включено в цю программу.Будь-" "ласка розпакуйте його" +#: engines/wintermute/detection.cpp:58 +msgid "Show FPS-counter" +msgstr "" + +#: engines/wintermute/detection.cpp:59 +msgid "Show the current number of frames per second in the upper left corner" +msgstr "" + #~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" #~ msgstr "" #~ "Знайдені ролики MPEG-2, але ScummVM був зібраний без підтримки MPEG-2" @@ -3264,12 +3347,6 @@ msgstr "" #~ msgid "Standard (16bpp)" #~ msgstr "Стандартний растеризатор (16bpp)" -#~ msgid "Alternative intro" -#~ msgstr "Алтернативний вступ" - -#~ msgid "Use an alternative game intro (CD version only)" -#~ msgstr "Використовувати альтернативний вступ гри (тільки CD версія)" - #~ msgid "MPEG2 cutscenes are no longer supported" #~ msgstr "Ролики MPEG2 більше не підтримуються" diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 39deaea204..d9761e1c38 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -528,7 +528,10 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) { // Recreate the audio stream audioTrack->resetStream(); - uint framesNeeded = _header.initialFrames; + uint framesNeeded = _header.initialFrames; + if (framesNeeded == 0) + framesNeeded = 1; + uint startAudioChunk = 0; int startAudioSearch = (lastRecord < 0) ? (frameIndex - 1) : (lastRecord - 1); |